summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-223-2/+58
* Merge branch 'ha_docs' into 'master' Drew Blessing2016-04-221-1/+1
|\
| * Fix linkDrew Blessing2016-04-221-1/+1
* | Merge branch 'ha_docs' into 'master' Drew Blessing2016-04-227-0/+524
|\ \ | |/
| * New HA docs [ci skip]Drew Blessing2016-04-227-0/+524
|/
* Merge branch 'sidekiq_troubleshooting' into 'master' Drew Blessing2016-04-222-0/+163
|\
| * Add Sidekiq troubleshooting docs [ci skip]Drew Blessing2016-04-222-0/+163
* | Merge branch 'rs-todos-feature-spec' into 'master' Robert Speicher2016-04-221-18/+20
|\ \
| * | Refactor Todos feature spec to be faster and less brittleRobert Speicher2016-04-221-18/+20
* | | Merge branch '15513-fix-undefined-can-method' into 'master' Robert Speicher2016-04-223-2/+25
|\ \ \ | |/ / |/| |
| * | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-223-2/+25
* | | Merge branch 'escape-label-title' into 'master' Jacob Schatz2016-04-221-1/+1
|\ \ \
| * | | Escapes label title in filtersescape-label-titlePhil Hughes2016-04-221-1/+1
| |/ /
* | | Merge branch 'fix/cherry-pick-specs-location' into 'master' Robert Speicher2016-04-221-0/+0
|\ \ \
| * | | Move cherry-pick feature specs to proper directoryfix/cherry-pick-specs-locationGrzegorz Bizon2016-04-221-0/+0
| |/ /
* | | Merge branch 'doc/gitlab-shell-tag' into 'master' Achilleas Pipinellis2016-04-221-1/+1
|\ \ \
| * | | Bump gitlab-shell to 2.7.2Achilleas Pipinellis2016-04-221-1/+1
| |/ /
* | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-222-30/+27
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2236-63/+253
| |\ \ \ | | |/ /
| * | | Add tests for filtering owned projectsissue_3799Alfredo Sumaran2016-04-222-30/+27
* | | | Merge branch 'fix-issue-with-assignee-not-updating' into 'master' Dmitriy Zaporozhets2016-04-223-2/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed issue with assignee object not being returnedPhil Hughes2016-04-223-2/+23
|/ / /
* | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-224-1/+43
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-21309-1422/+4992
| |\ \
| * | | Update CHANGELOGAlfredo Sumaran2016-04-211-0/+1
| * | | Do not display filters if user if there's no current_userAlfredo Sumaran2016-04-211-7/+8
| * | | Use compact syntaxAlfredo Sumaran2016-04-211-4/+1
| * | | Add testsAlfredo Sumaran2016-04-181-0/+30
| * | | Remove Spinach featureAlfredo Sumaran2016-04-182-19/+0
| * | | Allow filtering by Owned projectsAlfredo Sumaran2016-04-184-1/+33
* | | | Merge branch 'doc-gh-import-additions' into 'master' Achilleas Pipinellis2016-04-221-5/+9
|\ \ \ \
| * | | | Add newest enhancements to GH importer docsAchilleas Pipinellis2016-04-221-5/+9
* | | | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-229-4/+64
|\ \ \ \ \
| * | | | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-219-4/+64
| |/ / / /
* | | | | Merge branch 'doc_note_cherry_pick' into 'master' Achilleas Pipinellis2016-04-221-1/+2
|\ \ \ \ \
| * | | | | Use new Note styleguideAchilleas Pipinellis2016-04-221-1/+2
| |/ / / /
* | | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-225-12/+29
|\ \ \ \ \
| * | | | | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-192-10/+1
| * | | | | Always read diff_view setting from the cookieRobert Speicher2016-04-143-2/+28
* | | | | | Merge branch 'fix/private-labels-permissions' into 'master' Grzegorz Bizon2016-04-226-23/+93
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add Changelog entry for private labels security fixGrzegorz Bizon2016-04-221-0/+1
| * | | | | Use association search in issuable create serviceGrzegorz Bizon2016-04-222-12/+12
| * | | | | Add affinity checks in issue create serviceGrzegorz Bizon2016-04-221-2/+9
| * | | | | Update specs to accomodate issuable assign changesGrzegorz Bizon2016-04-224-21/+31
| * | | | | Verify label affiliation before assigning to issueGrzegorz Bizon2016-04-222-2/+54
|/ / / / /
* | | | | Merge branch 'label-text-color-sidebar' into 'master' Robert Speicher2016-04-213-3/+3
|\ \ \ \ \
| * | | | | Reverted label link helperlabel-text-color-sidebarPhil Hughes2016-04-211-1/+1
| * | | | | Reverted link changesPhil Hughes2016-04-212-5/+5
| * | | | | Removed console.logPhil Hughes2016-04-211-1/+0
| * | | | | Updated testsPhil Hughes2016-04-211-4/+4