summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rename snippets_path helper due to conflict19990-update-snippets-page-designMike Greiling2016-12-102-5/+5
* add new tests for snippets_finder.rbMike Greiling2016-12-101-1/+24
* use Snippet.none in favor of nil to allow chainingMike Greiling2016-12-101-1/+1
* implement snippets_scope_menu partial to reduce code duplicationMike Greiling2016-12-104-53/+45
* refactor duplicate code into a by_scope methodMike Greiling2016-12-101-35/+19
* move snippet edited timeago under the snippet titleMike Greiling2016-12-102-8/+14
* fix snippets reference id in search results (should be $ not #)Mike Greiling2016-12-101-1/+1
* conditionally display assoc project info in snippets indexMike Greiling2016-12-104-4/+13
* fix failing testsMike Greiling2016-12-103-4/+4
* update snippets list designMike Greiling2016-12-102-13/+20
* ensure all snippets count badge is accurate for non team membersMike Greiling2016-12-101-1/+4
* move project new snippet button into snippet scope navigation headerMike Greiling2016-12-101-27/+31
* add scope filters to project snippets pageMike Greiling2016-12-103-7/+52
* move new snippet button to main snippet navigation blockMike Greiling2016-12-103-48/+42
* remove plus icon in "new snippet" buttonMike Greiling2016-12-101-2/+0
* invert snippet action buttonsMike Greiling2016-12-102-4/+4
* remove unused class nameMike Greiling2016-12-102-4/+4
* update action button order for snippets pageMike Greiling2016-12-102-12/+12
* Merge branch '25324-change-housekeeping-btn-to-default' into 'master' Alfredo Sumaran2016-12-092-1/+5
|\
| * Use default btn styling for Housekeeping button on projects settings pageRyan Harris2016-12-062-1/+5
* | Merge branch 'issue_24020' into 'master' Alfredo Sumaran2016-12-093-1/+17
|\ \
| * | fix display hook error messagebasyura2016-12-053-1/+17
* | | Merge branch 'remove-your_email-gsub-in-help-page' into 'master' Sean McGivern2016-12-092-11/+1
|\ \ \
| * | | Stop replacing `$your_email` with the user's emailremove-your_email-gsub-in-help-pageRémy Coutable2016-12-092-11/+1
* | | | Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into 'ma...Jacob Schatz2016-12-0911-42/+36
|\ \ \ \
| * | | | Removed leave buttons from settings dropdowns23305-leave-project-and-leave-group-should-be-buttonsLuke "Jared" Bennett2016-11-2611-42/+36
* | | | | Merge branch 'workhorse-1.1.1' into 'master' Rémy Coutable2016-12-091-1/+1
|\ \ \ \ \
| * | | | | Use gitlab-workhose 1.1.1Jacob Vosmaer2016-12-081-1/+1
* | | | | | Merge branch 'update-button-font-weight' into 'master' Fatih Acet2016-12-092-1/+5
|\ \ \ \ \ \
| * | | | | | Updates the font weight of button styles because of the change to system fontsupdate-button-font-weightDimitrie Hoekstra2016-12-092-1/+5
* | | | | | | Merge branch 'members-dropdowns' into 'master' Fatih Acet2016-12-0913-20/+131
|\ \ \ \ \ \ \
| * | | | | | | Group links spec updatePhil Hughes2016-12-092-3/+8
| * | | | | | | Updated JS based on reviewPhil Hughes2016-12-093-16/+28
| * | | | | | | Updated members dropdownsPhil Hughes2016-12-0710-15/+109
* | | | | | | | Merge branch 'followup-7899' into 'master' Sean McGivern2016-12-091-6/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Use a single query in Projects::ProjectMembersController to fetch membersfollowup-7899Rémy Coutable2016-12-081-6/+5
* | | | | | | | | Merge branch 'update/installation-from-source-guide-8-15' into 'master' Alejandro Rodríguez2016-12-092-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Update "Installation from source" guide for 8.15.0update/installation-from-source-guide-8-15Douglas Barbosa Alexandre2016-12-092-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch '25374-svg-as-prop' into 'master' Fatih Acet2016-12-0915-106/+135
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Changes after review25374-svg-as-propFilipa Lacerda2016-12-092-4/+4
| * | | | | | | | Fix broken testFilipa Lacerda2016-12-091-2/+2
| * | | | | | | | Adds CHANGELOG entryFilipa Lacerda2016-12-091-0/+4
| * | | | | | | | Adds testsFilipa Lacerda2016-12-096-25/+62
| * | | | | | | | Uniformize props name formatFilipa Lacerda2016-12-098-33/+34
| * | | | | | | | Replace commit icon svg logicFilipa Lacerda2016-12-092-20/+8
| * | | | | | | | Replace play icon svg logicFilipa Lacerda2016-12-094-29/+28
* | | | | | | | | Merge branch 'fix/milestone-summary' into 'master' Sean McGivern2016-12-092-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add CHANGELOG entryfix/milestone-summaryDouglas Barbosa Alexandre2016-12-081-0/+4
| * | | | | | | | | Displays milestone remaining days only when it's presentDouglas Barbosa Alexandre2016-12-081-2/+4
* | | | | | | | | | Merge branch 'do-not-refresh-main-when-fork-target-branch-updated' into 'mast...Sean McGivern2016-12-094-14/+32
|\ \ \ \ \ \ \ \ \ \