Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-19Merge branch 'with-pipeline-view' into 'master' Douwe Maan
Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
2016-05-19Merge branch 'project-variables-ui' into 'master' Jacob Schatz
Project variables UI ![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png) ![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png) Closes #14091 See merge request !3942
2016-05-17Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski
2016-05-16Project variables UIPhil Hughes
Closes #14091
2016-05-14Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski
2016-05-14Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-14Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
# Conflicts: # config/initializers/1_settings.rb
2016-05-13remove extra space to fix codestyleGabriel Mazetto
2016-05-13Codestyle: make sure we have space around operatorsGabriel Mazetto
2016-05-13Merge branch 'health-check-route'Douwe Maan
# Conflicts: # db/schema.rb
2016-05-12Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz
Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
2016-05-12Support token header for health check token, and general cleanup of the ↵DJ Mountney
health_check feature.
2016-05-10Add health_check access token, and enforce on the health_check endpointDJ Mountney
Also added a health check page to the admin section for resetting the token.
2016-05-10Add the health_check gem end expose the health_check routeDJ Mountney
2016-05-10Code improveLong Nguyen
2016-05-09Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski
# Conflicts: # app/views/projects/ci/builds/_build.html.haml # app/views/projects/commit/_ci_commit.html.haml # app/views/projects/commit/_commit_box.html.haml
2016-05-09Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-09Revert "Eager load `lib/api`"Kamil Trzcinski
This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
2016-05-09Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski
2016-05-09Send trace to a browser incrementally when build is runningKamil Trzcinski
We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
2016-05-08WIPKamil Trzcinski
2016-05-08Routing refactoringLong Nguyen
2016-05-08Fix routing errorLong Nguyen
2016-05-08user routings refactorLong Nguyen
2016-05-05Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen
issue_15572_snippets_tab_under_user_profile
2016-05-04Added docker registry viewKamil Trzcinski
2016-05-03Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher
2016-05-02Added JWT controllerKamil Trzcinski
2016-05-02Add snippet tab under user profileLong Nguyen
2016-04-29Eager load `lib/api`Timothy Andrew
- So that the server doesn't have to be restarted for every change in dev.
2016-04-28Load the "New Branch" button asynchronouslyYorick Peterse
This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
2016-04-26Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski
2016-04-23Fix issue with impersonationDouwe Maan
2016-04-22Add letter_opener_web gemRobert Speicher
Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route.
2016-04-22Improved confirmation UXPhil Hughes
Closes #4228
2016-04-20Switch raw trace to use X-Sendfile headerTomasz Maczukin
2016-04-20Add raw trace output for GitLab WorkhorseTomasz Maczukin
2016-04-18Add support to cherry-pick any commitP.S.V.R
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-15Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable
Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
2016-04-15Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable
Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-14Merge branch 'auto-fsck' into 'master' Robert Speicher
Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
2016-04-13Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-13Load related MRs/branches asynchronouslyYorick Peterse
Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
2016-04-13Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski
* ci-commit-as-pipeline: (131 commits) Optimise Merge Request builds rendering Fix migrations on MySQL Update db/schema.rb Cleanup changes Cleanup required migrations Add indexes concurrently on PostgreSQL Fix CiStatus implementation and tests Fix group_member_spec to not leak information Fix doc for moving an issue Update tests for moving issues via API Tie example config to JIRA screenshot API: Ability to move an issue Added ability to add custom tags to transactions API: Avoid group leak while updating the group API: Return 404 if user does not have access to group Move 'New branch from issue' feature doc to web_editor.md Fix repository cache invalidation issue when project is recreated with an empty repo improve formatting Add `Gitlab.com?` method (doc) fix typo to ssh keys doc url ... Conflicts: app/controllers/projects/pipelines_controller.rb app/helpers/ci_status_helper.rb app/helpers/gitlab_routing_helper.rb app/views/projects/ci/commits/_commit.html.haml app/views/projects/commit/_ci_commit.html.haml
2016-04-13Pipeline viewKamil Trzcinski
2016-04-13WIPKamil Trzcinski
2016-04-12Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer
2016-04-12Move 'clear checks' button to applicatoin settingsJacob Vosmaer
2016-04-12Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre
2016-04-08Use singular resource for NotificationSettingDouglas Barbosa Alexandre
Since a user cannot have multiple NotificationSettings records for one group/project we can use singular resource.