summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2756-ee-to-ce-backport' into 'master'Douwe Maan2017-08-301-0/+2
|\
| * Backports EE 2756 logic to CE.2756-ee-to-ce-backportTiago Botelho2017-08-301-0/+2
* | Merge branch 'winh-notification-dropdowns' into 'master'Phil Hughes2017-08-301-0/+4
|\ \
| * | Make notification dropdowns consistentwinh-notification-dropdownswinh2017-08-281-0/+4
* | | Merge branch '37147-fix-fallback-emoji-alignment' into 'master'Filipa Lacerda2017-08-301-2/+1
|\ \ \
| * | | Remove commented out code37147-fix-fallback-emoji-alignmentEric Eastwood2017-08-291-1/+0
| * | | Better align fallback image emojisEric Eastwood2017-08-291-1/+1
* | | | Merge branch '35010-make-identicon-shared' into 'master'Filipa Lacerda2017-08-302-3/+3
|\ \ \ \
| * | | | Update identicon path and selectorkushalpandya2017-08-301-3/+3
| * | | | Renamed to `identicon` and make shared componentkushalpandya2017-08-301-0/+0
* | | | | Merge branch 'winh-issuable-dashboard-dropdowns' into 'master'Phil Hughes2017-08-302-0/+9
|\ \ \ \ \
| * | | | | Make issuable dashboard dropdowns consistentwinh-issuable-dashboard-dropdownswinh2017-08-292-0/+9
| | |_|/ / | |/| | |
* | | | | Add filter by my reactionHiroyuki Sato2017-08-3013-6/+210
* | | | | Merge branch 'mr-index-eager-load' into 'master'Douwe Maan2017-08-301-1/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Eager load head pipeline projects for MRs indexmr-index-eager-loadYorick Peterse2017-08-281-1/+11
* | | | | Adds position fixed to right sidebarPhil Hughes2017-08-291-1/+0
* | | | | Merge branch 'issue-boards-breadcrumbs-container' into 'master'Annabel Dunstone Gray2017-08-292-1/+3
|\ \ \ \ \
| * | | | | Fixes the breadcrumb container when in issue boardsissue-boards-breadcrumbs-containerPhil Hughes2017-08-182-1/+3
* | | | | | Merge branch '35793_fix_predicate_names' into 'master'Robert Speicher2017-08-2929-58/+58
|\ \ \ \ \ \
| * | | | | | replace `is_team_member?` with `team_member?`Maxim Rydkin2017-08-291-3/+3
| * | | | | | replace `is_spam?` with `spam?`Maxim Rydkin2017-08-292-2/+2
| * | | | | | replace `is_default_branch?` with `default_branch?`Maxim Rydkin2017-08-291-5/+5
| * | | | | | replace `is_dashboard_milestone?` with `dashboard_milestone?`Maxim Rydkin2017-08-293-3/+3
| * | | | | | replace `is_runner_queue_value_latest?` with `runner_queue_value_latest?`Maxim Rydkin2017-08-291-1/+1
| * | | | | | replace `is_update?` with `update?`Maxim Rydkin2017-08-292-6/+6
| * | | | | | replace `is_overlap?` with `overlap?`Maxim Rydkin2017-08-291-2/+2
| * | | | | | replace `is_group_milestone?` with `group_milestone?`Maxim Rydkin2017-08-296-12/+12
| * | | | | | replace `is_project_milestone?` with `project_milestone?`Maxim Rydkin2017-08-297-8/+8
| * | | | | | replace `is_ancestor?` with `ancestor?`Maxim Rydkin2017-08-292-4/+4
| * | | | | | replace `is_legacy_group_milestone?` with `legacy_group_milestone?`Maxim Rydkin2017-08-297-9/+9
| * | | | | | replace `is_edited?` with `edited?`Maxim Rydkin2017-08-294-4/+4
* | | | | | | Merge branch 'changes-bar-sticky-fix' into 'master'Filipa Lacerda2017-08-292-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixes the diff changes buttons from toggling when scrollingchanges-bar-sticky-fixPhil Hughes2017-08-292-1/+2
* | | | | | | | Merge branch '35048-empty-badges' into 'master'Phil Hughes2017-08-291-20/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevents rendering empty badge when pipeline request fails35048-empty-badgesFilipa Lacerda2017-08-291-20/+34
* | | | | | | | | Merge branch 'winh-file-encoding-dropdown' into 'master'Phil Hughes2017-08-291-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make file encoding dropdown consistentwinh-file-encoding-dropdownwinh2017-08-291-1/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'winh-todos-dashboard-dropdowns' into 'master'Phil Hughes2017-08-291-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make todos dashboard dropdowns consistentwinh-todos-dashboard-dropdownswinh2017-08-281-0/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'winh-merge-request-widget-dropdowns' into 'master'Phil Hughes2017-08-291-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make download dropdown on merge request page consistentwinh-merge-request-widget-dropdownswinh2017-08-291-0/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500...Kamil TrzciƄski2017-08-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove trigger_request.trigger.ownerShinya Maeda2017-08-291-1/+1
* | | | | | | | | | Merge branch '36882-disable-gitlab-project-import-button-if-source-disabled' ...Filipa Lacerda2017-08-291-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Disable GitLab Project Import Button if source disabledMark Fletcher2017-08-241-3/+4
* | | | | | | | | | Merge branch 'winh-member-search-dropdown' into 'master'Phil Hughes2017-08-291-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make member search dropdown consistentwinh-member-search-dropdownwinh2017-08-281-0/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '37069-remove-li' into 'master'Phil Hughes2017-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary divider37069-remove-liAnnabel Dunstone Gray2017-08-251-1/+1
* | | | | | | | | | | Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'Phil Hughes2017-08-291-8/+8
|\ \ \ \ \ \ \ \ \ \ \