summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
* Add a spec to verify comparison context inclusion in path when a version is c...Matthew Dodds2016-10-011-2/+13
* Refactor url_helpers for system note service and remove duplication of logic ...Matthew Dodds2016-09-302-18/+13
* Add link to comparison from system note, update changelogMatthew Dodds2016-09-293-4/+32
* Merge branch '22364-rails-cache-connection-pool-sidekiq-servers' into 'master' Rémy Coutable2016-09-292-0/+5
|\
| * Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-connection-pool-sidekiq-serversPaco Guzman2016-09-282-0/+5
* | Merge branch '21535-fix-hidden-diff-comments' into 'master' Fatih Acet2016-09-293-2/+3
|\ \
| * | make sure split-view diff discussions are made visible by "toggle comments" b...21535-fix-hidden-diff-commentsMike Greiling2016-09-292-1/+2
| * | fix typo "this files" -> "this file"Mike Greiling2016-09-291-1/+1
|/ /
* | Merge branch 'rs-remove-duplicate-versioninfo' into 'master' Robert Speicher2016-09-291-52/+0
|\ \
| * | Remove duplicate VersionInfo classRobert Speicher2016-09-291-52/+0
* | | Merge branch 'rs-blacklist-well-known' into 'master' Rémy Coutable2016-09-291-2/+3
|\ \ \
| * | | Add '.well-known' to the list of reserved namespacesrs-blacklist-well-knownRobert Speicher2016-09-291-2/+3
| |/ /
* | | Merge branch '22367-add-pipeline-id-build' into 'master' Rémy Coutable2016-09-294-2/+65
|\ \ \ | |/ / |/| |
| * | expose pipeline data in builds APIGuilherme Salazar2016-09-284-2/+65
| |/
* | Merge branch 'cs-remove-flog-flay' into 'master' Rémy Coutable2016-09-294-33/+0
|\ \
| * | Remove Flog as we use a Rubocop that does its job.cs-remove-flog-flayConnor Shea2016-09-284-33/+0
* | | Merge branch 'mrchrisw/mysql-connection-warn' into 'master' Stan Hu2016-09-291-1/+1
|\ \ \ | |/ / |/| |
| * | Update warn message for MySQL fixmrchrisw/mysql-connection-warnChris Wilson2016-09-281-1/+1
* | | Merge branch 'revert-9d302b8d' into 'master' Jacob Schatz2016-09-297-117/+0
|\ \ \ | |/ / |/| |
| * | Revert "Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-we...Jacob Schatz2016-09-297-117/+0
|/ /
* | Merge branch '22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-prev...Robert Speicher2016-09-281-1/+1
|\ \
| * | [ci-skip] Correct gitlab-shell installation instructions in docs22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-previous-gitlab-installAlejandro Rodríguez2016-09-281-1/+1
|/ /
* | Merge branch 'pipelines-for-commit' into 'master' Fatih Acet2016-09-2810-21/+39
|\ \
| * | Rearranged commit tabs and changed commit `Commit` column header to `Pipeline`pipelines-for-commitLuke Bennett2016-09-273-6/+6
| * | Update CHANGELOGKamil Trzcinski2016-09-271-0/+1
| * | Commit status icon now links to pipelines tab of commit viewLuke Bennett2016-09-273-10/+13
| * | Add Pipelines for CommitKamil Trzcinski2016-09-275-9/+23
* | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-287-21/+47
|\ \ \
| * | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-287-24/+21
| * | | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called...Patricio Cano2016-09-272-0/+29
* | | | Merge branch '22592-can-set-due-date-through-slash-commands-even-though-i-m-n...Douwe Maan2016-09-289-66/+216
|\ \ \ \
| * | | | Fix permission for setting an issue's due dateRémy Coutable2016-09-289-66/+216
* | | | | Merge branch 'fix-csfr-typo-in-doc' into 'master' Achilleas Pipinellis2016-09-281-8/+8
|\ \ \ \ \
| * | | | | Fix typo `CSFR` -> `CSRF` in the OAuth2 docfix-csfr-typo-in-docRémy Coutable2016-09-271-8/+8
* | | | | | Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' i...Fatih Acet2016-09-287-0/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Added CHANGELOG entry.Fatih Acet2016-09-282-0/+3
| * | | | | Review changesLuke Bennett2016-09-286-41/+33
| * | | | | Added soft wrap logic and button to editorLuke Bennett2016-09-287-2/+124
|/ / / / /
* | | | | Merge branch 'dz-improve-mr-versions' into 'master' Rémy Coutable2016-09-282-5/+6
|\ \ \ \ \
| * | | | | Add changelog for duplicate branch bug in mr version featuredz-improve-mr-versionsDmitriy Zaporozhets2016-09-281-0/+1
| * | | | | Fix duplicate master entries in the mr versions dropdownDmitriy Zaporozhets2016-09-281-5/+5
* | | | | | Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into '...Douwe Maan2016-09-281-0/+1
|\ \ \ \ \ \
| * | | | | | Tell Flay to ignore Gitlab::Diff::PositionTracer22202-reduce-duplication-in-gitlab-diff-position_tracerRémy Coutable2016-09-271-0/+1
* | | | | | | Merge branch '22679-avoid-abstract-reference-filter-project-requests' into 'm...Yorick Peterse2016-09-283-5/+22
|\ \ \ \ \ \ \
| * | | | | | | AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requestsPaco Guzman2016-09-283-5/+22
|/ / / / / / /
* | | | | | | Merge branch 'add-university-content' into 'master' Achilleas Pipinellis2016-09-2823-0/+1648
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Resolve merge request commentsadd-university-contentSean Packham2016-09-281-5/+5
| * | | | | | Fix linksSean Packham2016-09-271-3/+3
| * | | | | | Resolve merge request commentsSean Packham2016-09-274-35/+27