summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-greenAnnabel Dunstone Gray2017-04-131-0/+1
|\
| * Fixed alignment of empty task list itemsempty-task-list-alignmentPhil Hughes2017-04-111-0/+1
* | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-131-1/+2
|\ \
| * | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-1/+2
* | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-132-4/+7
|\ \ \
| * | | Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
| * | | Fix resolve spinner and add testLuke "Jared" Bennett2017-04-112-4/+2
* | | | Merge branch '30188-handle-remove-branch-failure' into 'master' Filipa Lacerda2017-04-131-5/+7
|\ \ \ \
| * | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failureSimon Knox2017-04-131-1/+3
| * | | | fix js error in MR remove branch failure handlerSimon Knox2017-04-121-4/+4
* | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-timeFilipa Lacerda2017-04-1311-622/+609
|\ \ \ \ \
| * | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundleAlfredo Sumaran2017-04-1011-622/+609
* | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' Filipa Lacerda2017-04-1318-1269/+1232
|\ \ \ \ \ \
| * | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundleAlfredo Sumaran2017-04-1018-1269/+1232
* | | | | | | Show sub-nav under Merge Requests when issue tracker is non-defaultKushal Pandya2017-04-1311-9/+37
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ...Clement Ho2017-04-131-14/+12
|\ \ \ \ \ \
| * | | | | | Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safariEric Eastwood2017-04-121-14/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs-fix-already-defined-constant' into 'master' Douwe Maan2017-04-121-2/+2
|\ \ \ \ \ \
| * | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constantRobert Speicher2017-04-121-2/+2
* | | | | | | Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-127-27/+46
|\ \ \ \ \ \ \
| * | | | | | | Move event icons into events_helperuse-avatars-in-activity-viewAnnabel Dunstone Gray2017-04-123-21/+31
| * | | | | | | Add helper for using avatars vs iconsAnnabel Dunstone Gray2017-04-116-27/+19
| * | | | | | | Reuse system notes helper for profile event iconsAnnabel Dunstone Gray2017-04-117-25/+20
| * | | | | | | Only show icons on profile page; change to case statementAnnabel Dunstone Gray2017-04-114-18/+21
| * | | | | | | Use avatars instead of icons in activity viewAnnabel Dunstone Gray2017-04-105-24/+43
* | | | | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' Alfredo Sumaran2017-04-126-8/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Update all instances of "fa-refresh" to "fa-spinner"Andrew Torres2017-04-116-8/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '30858-system-notes-indent' into 'master' Jacob Schatz2017-04-121-4/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Indent system notes on desktop screensAnnabel Dunstone Gray2017-04-121-4/+12
* | | | | | | | | Merge branch 'change-merged-icon' into 'master' Jacob Schatz2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update merged iconchange-merged-iconAnnabel Dunstone Gray2017-04-111-1/+1
* | | | | | | | | | Merge branch 'fix-preloading-merge_request_diff' into 'master' Stan Hu2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use preload to avoid Rails using JOINLin Jen-Shin2017-04-131-1/+1
* | | | | | | | | | | Reset New branch button when issue state changes💃 Winnie 💃2017-04-121-51/+57
* | | | | | | | | | | Improve webpack-dev-server compatibility with non-localhost setups.Mike Greiling2017-04-123-5/+36
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '2120-issues-search-bar-not-picking-up' into 'master' Annabel Dunstone Gray2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix filtered search input width for IEClement Ho2017-04-121-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-missing-capitalisation-buttons' into 'master' Clement Ho2017-04-121-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed missing help ui view capitalisation buttonsfix-missing-capitalisation-buttonsJose Ivan Vargas2017-04-111-4/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-121-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-121-0/+6
* | | | | | | | | Merge branch 'user-activity-scroll-bar' into 'master' Annabel Dunstone Gray2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Let browser set overflow-x scroll on user activity calendar.user-activity-scroll-barBryce Johnson2017-04-111-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-121-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-121-2/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-121-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-2/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/subgroup-hide-button' into 'master' Rémy Coutable2017-04-122-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-113-5/+2
| * | | | | | | | | fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-302-1/+5