summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casingRobert Speicher2016-01-314-6/+6
* Update CHANGELOGRobert Speicher2016-01-311-2/+6
* Merge branch 'improve-gitlab-flow-doc' into 'master' Achilleas Pipinellis2016-01-311-3/+4
|\
| * Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-docRémy Coutable2016-01-291-3/+4
* | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-3113-78/+206
|\ \
| * | Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
| * | Fix specs and add a new oneDouwe Maan2016-01-302-28/+37
| * | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-2912-75/+194
* | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-306-14/+14
|\ \ \
| * | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-296-14/+14
* | | | Merge branch 'cache-broadcast-message-current' into 'master' Dmitriy Zaporozhets2016-01-301-1/+3
|\ \ \ \
| * | | | Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
| * | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
| |/ / /
* | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-3011-9/+44
|\ \ \ \
| * | | | Update CHANGELOGbackground-delete-processJosh Frye2016-01-293-8/+6
| * | | | First pass at deleting projects in the background.Josh Frye2016-01-2911-12/+49
* | | | | Merge branch 'warn-admin-oauth' into 'master' Douwe Maan2016-01-302-1/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve text on warning messageZeger-Jan van de Weg2016-01-261-1/+3
| * | | | Warn admin of granting admin rights during OAuthZeger-Jan van de Weg2016-01-262-1/+9
* | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-291-5/+5
|\ \ \ \ \
| * | | | | Fixed typo for PRIVATE-TOKEN header Markus Fisch2016-01-271-5/+5
* | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-01-291-1/+1
|\ \ \ \ \ \
| * | | | | | add missing `RAILS_ENV=production` bit to bundle commandMaverik Gately2016-01-271-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into 'mas...Douglas Barbosa Alexandre2016-01-292-1/+33
|\ \ \ \ \ \
| * | | | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-292-1/+33
* | | | | | | Merge branch 'increase_lfs_size_column' into 'master' Drew Blessing2016-01-293-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Increase LFS objects size columnDrew Blessing2016-01-293-3/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'focus-emoji-search-field' into 'master' Jacob Schatz2016-01-294-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added tests to emoji search field focusPhil Hughes2016-01-292-0/+7
| * | | | | Auto-focus emoji award search fieldPhil Hughes2016-01-292-1/+2
* | | | | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-296-21/+72
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix Rubocop errornote-background-jobJosh Frye2016-01-281-3/+3
| * | | | | Update testsJosh Frye2016-01-282-3/+27
| * | | | | [WIP] Background process note logic for #3948Josh Frye2016-01-284-18/+45
* | | | | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-2910-235/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-2810-235/+8
* | | | | | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-293-5/+26
|\ \ \ \ \ \
| * | | | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-283-5/+26
| |/ / / / /
* | | | | | Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' Dmitriy Zaporozhets2016-01-291-0/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filtersRobert Speicher2016-01-281-0/+6
* | | | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-293-8/+8
|\ \ \ \ \ \
| * | | | | | add back master only for ruby 2.1 imagesJames Lopez2016-01-281-6/+4
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-...James Lopez2016-01-2840-313/+569
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-284-12/+14
* | | | | | | Make changes in config/initializers/1_settings.rbSytse Sijbrandij2016-01-281-0/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-287-22/+24
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2845-95/+147
| |\ \ \ \ \ \
| * | | | | | | Fix specsDouwe Maan2016-01-284-4/+7
| * | | | | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-275-22/+19
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-286-43/+84
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |