summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert to use Mounter method to check existence22768-revert-to-touch-file-systemPaco Guzman2016-09-302-1/+2
* Merge branch 'lfs-token-race-condition-fix' into 'master' Patricio Cano2016-09-291-7/+2
|\
| * Fix race condition that can be triggered if the token expires right after we ...lfs-token-race-condition-fixPatricio Cano2016-09-291-7/+2
* | Update CHANGELOG with 8.12.2 and 8.12.3 changes.Ruben Davila2016-09-291-4/+10
* | Merge branch '22632-fix-project-explore-dropdown-alignment' into 'master' Annabel Dunstone Gray2016-09-291-2/+2
|\ \
| * | right-align dropdown menus to prevent horizontal page overflowMike Greiling2016-09-291-2/+2
|/ /
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-291-2/+13
|\ \
| * \ Merge branch '22450-restrict-origin' into 'master' Douwe Maan2016-09-271-2/+13
| |\ \
| | * | Set a restrictive CORS policy on the API for credentialed requestsNick Thomas2016-09-261-0/+11
| | * | Move Rack::Attack and Rack::Cors middlewares to be before Warden::ManagerNick Thomas2016-09-261-2/+2
| |/ /
* | | Add CHANGELOG entries for 8.11.8, 8.10.11, and 8.9.11Rémy Coutable2016-09-291-0/+18
* | | Merge branch 'fix/rugged-repo-error' into 'master' Rémy Coutable2016-09-298-4/+62
|\ \ \ | |_|/ |/| |
| * | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-298-4/+62
* | | Merge branch 'axil/gitlab-ce-typos_runners_pages' into 'master' Achilleas Pipinellis2016-09-298-40/+44
|\ \ \ | |/ / |/| |
| * | Fix grammar and typos in Runners pagesaxil/gitlab-ce-typos_runners_pagesAchilleas Pipinellis2016-09-288-40/+44
* | | Merge branch '22544-long-commit-message' into 'master' Fatih Acet2016-09-292-1/+7
|\ \ \
| * | | Fixes long commit messages overflow viewport in file treeFilipa Lacerda2016-09-292-1/+7
|/ / /
* | | Merge branch 'fix-double-changelog-header-for-8-13' into 'master' Robert Speicher2016-09-291-2/+1
|\ \ \
| * | | Update CHANGELOGfix-double-changelog-header-for-8-13Luke "Jared" Bennett2016-09-291-2/+1
|/ / /
* | | Merge branch 'issue_22382' into 'master' Rémy Coutable2016-09-295-9/+16
|\ \ \
| * | | Expose project share expiration_date field on APIissue_22382Felipe Artur2016-09-285-9/+16
* | | | Merge branch 'fix-html5-color-inputs' into 'master' Annabel Dunstone Gray2016-09-293-4/+4
|\ \ \ \
| * | | | remove instances of <input type="color" /> due to inconsistent browser supportMike Greiling2016-09-293-4/+4
* | | | | Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-2913-15/+15
|\ \ \ \ \
| * | | | | Fix test failure by accessing Content-Type header directly.cs-upgrade-deviseConnor Shea2016-09-271-1/+1
| * | | | | Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-2712-14/+14
* | | | | | 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
View Lorry Controller Status