summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-204-8/+11
* Post-merge improve of CI permissionsKamil Trzcinski2016-09-206-15/+24
* Merge branch 'order-stages-by-pipeline' into 'master' Rémy Coutable2016-09-202-2/+3
|\
| * Render stages in valid orderKamil Trzcinski2016-09-202-2/+3
* | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-2011-29/+82
|\ \ | |/ |/|
| * add missing spacefeature/github-edit-pathJames Lopez2016-09-201-1/+1
| * fix CSSJames Lopez2016-09-201-1/+1
| * fix indent in JS fileJames Lopez2016-09-201-1/+1
| * updated example img in docsJames Lopez2016-09-201-0/+0
| * fixes CSS issues and namespace path issue. Also tested in different browsers.James Lopez2016-09-202-6/+16
| * some UI changesJames Lopez2016-09-202-15/+8
| * few fixes based on MR feedbackJames Lopez2016-09-203-20/+11
| * Fix namespace helper - use pluck instead of slower map version.James Lopez2016-09-201-1/+1
| * modify github import JS and controller so we can now specify a namespace and/...James Lopez2016-09-2011-28/+87
* | Merge branch '22364-rails-cache-redis-connection-pool' into 'master' Yorick Peterse2016-09-202-0/+5
|\ \
| * | Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-redis-connection-poolPaco Guzman2016-09-202-0/+5
* | | Merge branch 'merge-request-push-compare-ui' into 'master' Jacob Schatz2016-09-206-48/+99
|\ \ \
| * \ \ Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-2039-78/+443
| |\ \ \ | | |/ /
| * | | Merge branch 'merge-request-push-compare-ui' of gitlab.com:gitlab-org/gitlab-...Bryce Johnson2016-09-2088-545/+2159
| |\ \ \
| | * | | Fix newlines added to README.Bryce Johnson2016-09-191-4/+1
| | * | | Switch out comments_disabled for diff_notes_disabled.Bryce Johnson2016-09-191-3/+2
| | * | | style updatestauriedavis2016-09-191-6/+20
| | * | | Shush rubocop.Bryce Johnson2016-09-191-1/+0
| | * | | Add 'Show latest version' button.Bryce Johnson2016-09-191-0/+1
| | * | | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-196-47/+87
| * | | | Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-17132-1035/+1151
| |\ \ \ \
| * | | | | Fix newlines added to README.Bryce Johnson2016-09-151-4/+1
| * | | | | Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-155-62/+84
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'merge-request-push-compare-ui' of gitlab.com:gitlab-org/gitlab-...Bryce Johnson2016-09-151-6/+20
| |\ \ \ \ \ \
| | * | | | | | style updatestauriedavis2016-09-141-6/+20
| * | | | | | | Switch out comments_disabled for diff_notes_disabled.Bryce Johnson2016-09-151-3/+2
| * | | | | | | Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-155-2/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Shush rubocop.Bryce Johnson2016-09-141-1/+0
| * | | | | | | Add 'Show latest version' button.Bryce Johnson2016-09-141-0/+1
| * | | | | | | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-146-47/+87
* | | | | | | | Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master' Douwe Maan2016-09-209-20/+219
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve the Unsubscribe confirmation pageRémy Coutable2016-09-202-7/+11
| * | | | | | | | Fix initial implementation to actually render the unsubscribe pageRémy Coutable2016-09-204-13/+54
| * | | | | | | | Fix "Unsubscribe" link in notification emails that is triggered by anti-virusMaximiliano Perez Coto2016-09-209-20/+174
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'commit-notes-jump-to-button-remove' into 'master' Robert Speicher2016-09-202-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Hide jump to next discussion button on commit notesPhil Hughes2016-09-202-1/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'rs-dry-akismet-service' into 'master' Rémy Coutable2016-09-201-27/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Reduce duplication in AkismetServicers-dry-akismet-serviceRobert Speicher2016-09-201-27/+16
* | | | | | | | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-2013-8/+250
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::ResultKamil Trzcinski2016-09-203-12/+12
| * | | | | | | Use early return in lfs_token_checkKamil Trzcinski2016-09-201-10/+10
| * | | | | | | Fix test failureKamil Trzcinski2016-09-191-1/+1
| * | | | | | | Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-1913-3/+245
* | | | | | | | Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master' Rémy Coutable2016-09-201-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove trailing spaces from messages in Gitlab::Regexrs-trailing-spaces-in-regex-messagesRobert Speicher2016-09-201-3/+3
| | |/ / / / / / | |/| | | | | |