summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add organization field to user profileDmitriy Zaporozhets2016-09-272-1/+5
* Merge branch 'cs-inline-js-search' into 'master' Fatih Acet2016-09-273-31/+47
|\
| * Tidy up the code a bitcs-inline-js-searchAlfredo Sumaran2016-08-262-22/+20
| * Fix dropdown vertical positionAlfredo Sumaran2016-08-261-1/+1
| * Move data attribute information to relevant elements.Connor Shea2016-08-261-11/+9
| * Remove inline JavaScript for Search autocomplete.Connor Shea2016-08-262-21/+41
* | Merge branch 'improvement/project-with-board-factory' into 'master' Robert Speicher2016-09-271-0/+8
|\ \
| * | Improve project_with_board factory to create the default listsimprovement/project-with-board-factoryDouglas Barbosa Alexandre2016-09-261-0/+8
* | | Merge branch 'resolve-buttons-path' into 'master' Jacob Schatz2016-09-268-48/+25
|\ \ \
| * | | Changed props to use stringsresolve-buttons-pathPhil Hughes2016-09-212-6/+6
| * | | Fixed comment & resolve buttonPhil Hughes2016-09-212-7/+4
| * | | Pass the full project path for resolve buttonsPhil Hughes2016-09-216-38/+18
* | | | Merge branch '22640-use-v-cloak-on-button-text' into 'master' Jacob Schatz2016-09-261-1/+1
|\ \ \ \
| * | | | Added v-cloak to resolve disc buttonLuke Bennett2016-09-261-1/+1
* | | | | Merge branch '22525-emoji-dropdown-shows-search-results-label-several-times' ...Fatih Acet2016-09-261-1/+1
|\ \ \ \ \
| * | | | | Added `@zeiv`s changes to fix awards search, including CHANGELOG where he is ...Luke Bennett2016-09-271-1/+1
* | | | | | Merge branch 'issue-boards-filter-label-spaces' into 'master' Fatih Acet2016-09-261-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed list issues not loading with spaces in filtered valuesissue-boards-filter-label-spacesPhil Hughes2016-09-081-1/+1
* | | | | | Merge branch 'full-width-new-snippet-button' into 'master' Fatih Acet2016-09-268-20/+32
|\ \ \ \ \ \
| * | | | | | Added full-width new snippet button on mobile and corrected capitalizationfull-width-new-snippet-buttonLuke Bennett2016-09-188-20/+32
* | | | | | | Merge branch 'fl-18932-revoke-button' into 'master' Fatih Acet2016-09-261-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Removes class 'btn-link' of Revoke buttonFilipa Lacerda2016-09-261-1/+1
* | | | | | | Merge branch '22500-can-t-paginate-through-snippets' into 'master' Robert Speicher2016-09-262-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix snippets pagination22500-can-t-paginate-through-snippetsRémy Coutable2016-09-262-2/+4
* | | | | | | Merge branch 'patch-2' into 'master' Rémy Coutable2016-09-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed a broken documentation link to the wiki-specific-markdown.Brandon Patton2016-08-301-1/+1
* | | | | | | Merge branch 'fix/import-services' into 'master' Rémy Coutable2016-09-261-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixes issue with rails reserved keyword type exporting/importing services. Al...James Lopez2016-09-261-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ldap' into 'master' Rémy Coutable2016-09-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fix LDAP omniauth regression (Closes: #22357)Dmitry Smirnov2016-09-211-1/+1
* | | | | | | Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' Fatih Acet2016-09-244-10/+58
|\ \ \ \ \ \ \
| * | | | | | | Ensure milestone counts work with no datagitlab-ce-milestone-tab-badgesAlfredo Sumaran2016-09-071-4/+5
| * | | | | | | Fix failing specs and improve htmlAlfredo Sumaran2016-09-073-2/+13
| * | | | | | | Added a small helper to reduce logic in the viewDan Rowden2016-09-072-3/+14
| * | | | | | | Take out of /dashboard/milestones as the helper query clashes with kaminari a...Dan Rowden2016-09-071-4/+8
| * | | | | | | Updated milestone count helper plus testsDan Rowden2016-09-072-4/+4
| * | | | | | | Use newer hash styleDan Rowden2016-09-072-6/+6
| * | | | | | | Improved milestone counts with a single queryDan Rowden2016-09-072-14/+15
| * | | | | | | Show badges in Milestone tabs and padding in Milestone list (both to match Is...Dan Rowden2016-09-073-6/+26
* | | | | | | | Merge branch 'flash-container-z-index' into 'master' Fatih Acet2016-09-241-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed z-index from flash containerflash-container-z-indexPhil Hughes2016-09-081-2/+0
* | | | | | | | | Merge branch '22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the...Fatih Acet2016-09-241-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed links that wrap the icon svg to `display: block` so there isn't any i...22459-tooltips-for-mini-pipeline-graph-in-pipeline-list-use-the-svg-instead-of-containerLuke Bennett2016-09-231-0/+4
* | | | | | | | | | Merge branch 'fix/database-seeds' into 'master' Rémy Coutable2016-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix pipeline fixtures for development environmentGrzegorz Bizon2016-09-221-1/+1
* | | | | | | | | | Merge branch 'fix/speed-up-group-milestone-show' into 'master' Yorick Peterse2016-09-231-6/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use select(:foo) instead of map(&:foo) in GlobalMilestoneAhmad Sherif2016-09-231-3/+3
| * | | | | | | | | | Ensure milestones passed to GlobalMilestone is an ActiveRecord::RelationAhmad Sherif2016-09-231-13/+4
| * | | | | | | | | | Reduce number of queries when calling GlobalMilestone#{labels,participants}Ahmad Sherif2016-09-231-2/+12
| * | | | | | | | | | Eager-load assignee and labels associations for GlobalMilestore issuablesAhmad Sherif2016-09-231-2/+2