summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Restore "r" shortcutfix-r-shortcutAlfredo Sumaran2016-05-041-0/+4
* Merge branch 'gravatar-fix' into 'master' Rémy Coutable2016-05-043-3/+3
|\
| * Use the new admin settings for gravatarArtem Sidorenko2016-05-043-3/+3
* | Merge branch 'compact-files-list' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \
| * | Make files list more compact by reducing row height from 47px to 44pxcompact-files-listDmitriy Zaporozhets2016-05-021-1/+1
* | | Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \
| * | | fix: in recent versions of Docker, the /.dockerinit file doesn't exist; use /...Jason Roehm2016-04-261-1/+1
* | | | Merge branch 'exec-in-launch-wrappers' into 'master' Douwe Maan2016-05-042-3/+3
|\ \ \ \
| * | | | Use 'exec' in Unicorn and Sidekiq launch scriptsJacob Vosmaer2016-04-282-3/+3
* | | | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-049-67/+105
|\ \ \ \ \
| * | | | | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tagRémy Coutable2016-05-045-53/+102
| * | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_ta...Rémy Coutable2016-05-047-49/+38
* | | | | | Merge branch 'fix-typo-in-user-steps' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in user steps featureKarlo Soriano2016-04-271-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'doc-fix-db-gem-install-instructions' into 'master' Rémy Coutable2016-05-041-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add explicit --with statement for postgres and mysql gem groups as necessary....mike2016-04-271-2/+2
* | | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-0411-9/+71
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-2911-9/+71
| |/ / / /
* | | | | Merge branch 'feature-proposal-contribution-guidelines' into 'master' Douwe Maan2016-05-041-0/+10
|\ \ \ \ \
| * | | | | feature proposal issue template in contributing guidefeature-proposal-contribution-guidelinesJob van der Voort2016-04-281-0/+10
* | | | | | Merge branch 'lstrip-cop' into 'master' Rémy Coutable2016-05-041-2/+1
|\ \ \ \ \ \
| * | | | | | Enable LstripRstrip copConnor Shea2016-04-271-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-042-15/+25
|\ \ \ \ \ \
| * | | | | | Instrument methods used in email diffsSean McGivern2016-05-042-15/+25
* | | | | | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove unnecessary method call in events viewKarlo Soriano2016-05-011-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'create-wikis-during-check' into 'master' Douwe Maan2016-05-042-16/+51
|\ \ \ \ \ \ \
| * | | | | | | Initialize wikis on legacy projects during checkJacob Vosmaer2016-04-262-16/+51
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-045-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-035-2/+6
* | | | | | | | Merge branch 'rs-unique-signup-fields' into 'master' Douwe Maan2016-05-044-22/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve uniqueness of field names on the signup formrs-unique-signup-fieldsRobert Speicher2016-04-194-22/+29
* | | | | | | | | Merge branch 'fix-performance-links' into 'master' Yorick Peterse2016-05-041-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fixed username links in the performance guideYorick Peterse2016-05-041-3/+3
* | | | | | | | | Merge branch 'fix-master-spec' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix a spec that was failing due to !3483Rémy Coutable2016-05-041-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-05-041-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Made it clearer that issue_id means iid, not id.Aral Balkan2016-05-041-5/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'signout-rel-url' into 'master' Robert Speicher2016-05-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
* | | | | | | | | Merge branch 'upgrade-rspec-rails' into 'master' Robert Speicher2016-05-033-25/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-013-25/+19
* | | | | | | | | | Merge branch 'link-to-code-review-guide' into 'master' Robert Speicher2016-05-031-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Link to gitlab code review guide in contributing guidelinesKarlo Soriano2016-05-031-2/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'improve-2fa-note' into 'master' Robert Speicher2016-05-032-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-032-2/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'doc-installation-pg_trgm' into 'master' Achilleas Pipinellis2016-05-031-7/+49
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add clear instructions on installing the pg_trgm extensionAchilleas Pipinellis2016-05-031-7/+49
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'performance-guide' into 'master' Achilleas Pipinellis2016-05-032-0/+259
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Copyedit performance documentAchilleas Pipinellis2016-05-031-22/+22