Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casing | Robert Speicher | 2016-01-31 | 4 | -6/+6 |
* | Update CHANGELOG | Robert Speicher | 2016-01-31 | 1 | -2/+6 |
* | Merge branch 'improve-gitlab-flow-doc' into 'master' | Achilleas Pipinellis | 2016-01-31 | 1 | -3/+4 |
|\ | |||||
| * | Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-doc | Rémy Coutable | 2016-01-29 | 1 | -3/+4 |
* | | Merge branch 'rename-inline-diff' into 'master' | Robert Speicher | 2016-01-31 | 13 | -78/+206 |
|\ \ | |||||
| * | | Fewer html_safesrename-inline-diff | Douwe Maan | 2016-01-30 | 1 | -2/+2 |
| * | | Fix specs and add a new one | Douwe Maan | 2016-01-30 | 2 | -28/+37 |
| * | | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 12 | -75/+194 |
* | | | Merge branch 'rs-issue-12706' into 'master' | Douwe Maan | 2016-01-30 | 6 | -14/+14 |
|\ \ \ | |||||
| * | | | Increase the minimum length for commit SHA matching to 7rs-issue-12706 | Robert Speicher | 2016-01-29 | 6 | -14/+14 |
* | | | | Merge branch 'cache-broadcast-message-current' into 'master' | Dmitriy Zaporozhets | 2016-01-30 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Change ttl to 1 minutecache-broadcast-message-current | Josh Frye | 2016-01-29 | 1 | -1/+1 |
| * | | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770 | Josh Frye | 2016-01-29 | 1 | -1/+3 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'origin/background-delete-process' | Dmitriy Zaporozhets | 2016-01-30 | 11 | -9/+44 |
|\ \ \ \ | |||||
| * | | | | Update CHANGELOGbackground-delete-process | Josh Frye | 2016-01-29 | 3 | -8/+6 |
| * | | | | First pass at deleting projects in the background. | Josh Frye | 2016-01-29 | 11 | -12/+49 |
* | | | | | Merge branch 'warn-admin-oauth' into 'master' | Douwe Maan | 2016-01-30 | 2 | -1/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Improve text on warning message | Zeger-Jan van de Weg | 2016-01-26 | 1 | -1/+3 |
| * | | | | Warn admin of granting admin rights during OAuth | Zeger-Jan van de Weg | 2016-01-26 | 2 | -1/+9 |
* | | | | | Merge branch 'patch-1' into 'master' | Achilleas Pipinellis | 2016-01-29 | 1 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed typo for PRIVATE-TOKEN header | Markus Fisch | 2016-01-27 | 1 | -5/+5 |
* | | | | | | Merge branch 'patch-1' into 'master' | Robert Speicher | 2016-01-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add missing `RAILS_ENV=production` bit to bundle command | Maverik Gately | 2016-01-27 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into 'mas... | Douglas Barbosa Alexandre | 2016-01-29 | 2 | -1/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-id | Douglas Barbosa Alexandre | 2016-01-29 | 2 | -1/+33 |
* | | | | | | | Merge branch 'increase_lfs_size_column' into 'master' | Drew Blessing | 2016-01-29 | 3 | -3/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Increase LFS objects size column | Drew Blessing | 2016-01-29 | 3 | -3/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'focus-emoji-search-field' into 'master' | Jacob Schatz | 2016-01-29 | 4 | -1/+9 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Added tests to emoji search field focus | Phil Hughes | 2016-01-29 | 2 | -0/+7 |
| * | | | | | Auto-focus emoji award search field | Phil Hughes | 2016-01-29 | 2 | -1/+2 |
* | | | | | | Merge branch 'note-background-job' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 6 | -21/+72 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Fix Rubocop errornote-background-job | Josh Frye | 2016-01-28 | 1 | -3/+3 |
| * | | | | | Update tests | Josh Frye | 2016-01-28 | 2 | -3/+27 |
| * | | | | | [WIP] Background process note logic for #3948 | Josh Frye | 2016-01-28 | 4 | -18/+45 |
* | | | | | | Merge branch 'rs-remove-ip-blocking' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 10 | -235/+8 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking | Robert Speicher | 2016-01-28 | 10 | -235/+8 |
* | | | | | | Merge branch 'rs-transient-capybara-timeout' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 3 | -5/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeout | Robert Speicher | 2016-01-28 | 3 | -5/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filters | Robert Speicher | 2016-01-28 | 1 | -0/+6 |
* | | | | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' | Marin Jankovski | 2016-01-29 | 3 | -8/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add back master only for ruby 2.1 images | James Lopez | 2016-01-28 | 1 | -6/+4 |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-... | James Lopez | 2016-01-28 | 40 | -313/+569 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | trick rubocop and temporarily add ruby 2.1 images for any branch | James Lopez | 2016-01-28 | 4 | -12/+14 |
* | | | | | | | Make changes in config/initializers/1_settings.rb | Sytse Sijbrandij | 2016-01-28 | 1 | -0/+1 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'mr-merge-base' into 'master' | Robert Speicher | 2016-01-28 | 7 | -22/+24 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into mr-merge-basemr-merge-base | Douwe Maan | 2016-01-28 | 45 | -95/+147 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix specs | Douwe Maan | 2016-01-28 | 4 | -4/+7 |
| * | | | | | | | Correctly determine MR diff base when MR has merge conflicts | Douwe Maan | 2016-01-27 | 5 | -22/+19 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'highlight-blame' into 'master' | Robert Speicher | 2016-01-28 | 6 | -43/+84 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | |