summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| * | | | | | | | Added performance guidelinesperformance-guideYorick Peterse2016-04-302-0/+259
* | | | | | | | | Merge branch 'update-changelog' into 'master' Yorick Peterse2016-05-031-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated CHANGELOG for 8.7.2Yorick Peterse2016-05-031-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Update link to release docs in READMERobert Speicher2016-05-031-1/+1
|/ / / / / / / /
* | | | | | | | Update CHANGELOG for 8.6.8, 8.5.12, et al.Robert Speicher2016-05-021-1/+56
* | | | | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-0245-316/+906
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs-notes-privilege-escalation' into 'master' Robert Speicher2016-04-262-10/+42
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Prevent privilege escalation via notes APIRobert Speicher2016-04-262-10/+42
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-2643-306/+864
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' Robert Speicher2016-04-262-2/+39
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Improve Milestones API specsRémy Coutable2016-04-252-38/+27
| | | * | | | | | | | Filter confidential issues from milestones API if user does not have accessStan Hu2016-04-253-2/+50
| | * | | | | | | | | Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master' Robert Speicher2016-04-252-0/+13
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-252-0/+13
| | * | | | | | | | | | Merge branch 'fix-impersonation-issue' into 'master' Robert Speicher2016-04-259-69/+188
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Store original user in variableDouwe Maan2016-04-221-2/+2