summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor time trackingrefactor-time-trackingClement Ho2017-04-1424-485/+445
* Merge branch 'clear-instructions' into 'master' Yorick Peterse2017-04-131-8/+5
|\
| * Make instructions clearerclear-instructionsSid Sijbrandij2017-04-131-8/+5
* | Merge branch 'sh-add-icon-for-active-service-template' into 'master'Robert Speicher2017-04-131-1/+1
|\ \
| * | Use an icon to indicate whether service template is activeStan Hu2017-04-131-1/+1
|/ /
* | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-132-13/+34
|\ \
| * | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-132-13/+34
* | | Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-135-10/+41
|\ \ \
| * | | Update tests for the fact that we would skip one linefix-trace-seeking-readlineLin Jen-Shin2017-04-131-3/+3
| * | | Don't seek at all if the log is small anywayLin Jen-Shin2017-04-131-5/+3
| * | | Add changelog entryLin Jen-Shin2017-04-131-0/+4
| * | | After Trace#limit, we seek to the next line in caseLin Jen-Shin2017-04-134-3/+32
* | | | Merge branch 'empty-task-list-alignment' into 'master' jej/master-greenjej-master-greenAnnabel Dunstone Gray2017-04-132-0/+5
|\ \ \ \
| * | | | Fixed alignment of empty task list itemsempty-task-list-alignmentPhil Hughes2017-04-112-0/+5
* | | | | Merge branch 'notebook-katex-rendering-improvements' into 'master' Jacob Schatz2017-04-131-15/+44
|\ \ \ \ \
| * | | | | Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvementsPhil Hughes2017-04-131-15/+44
* | | | | | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' Kamil Trzciński2017-04-134-8/+35
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-133-5/+16
| * | | | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-132-4/+20
* | | | | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' Filipa Lacerda2017-04-133-4/+9
|\ \ \ \ \ \
| * | | | | | Review changes30622-resolve-note-loading-icon-goneLuke "Jared" Bennett2017-04-121-0/+5
| * | | | | | Fix resolve spinner and add testLuke "Jared" Bennett2017-04-113-4/+4
* | | | | | | Merge branch '30188-handle-remove-branch-failure' into 'master' Filipa Lacerda2017-04-133-5/+58
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failureSimon Knox2017-04-133-1/+54
| * | | | | | 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-1312-697/+682
|\ \ \ \ \ \ \
| * | | | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundleAlfredo Sumaran2017-04-1012-697/+682
* | | | | | | | 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
* | | | | | | | Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' Alfredo Sumaran2017-04-1312-9/+41
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Show sub-nav under Merge Requests when issue tracker is non-defaultKushal Pandya2017-04-1312-9/+41
|/ / / / / / /
* | | | | | | Revert "Fix registry for projects with uppercases in path"Grzegorz Bizon2017-04-132-20/+4
* | | | | | | Fix registry for projects with uppercases in pathGrzegorz Bizon2017-04-132-4/+20
| |_|_|_|/ / |/| | | | |
* | | | | | 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 'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root...Sean McGivern2017-04-122-7/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-rootRémy Coutable2017-04-122-7/+11
* | | | | | | | 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-127-8/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner"Andrew Torres2017-04-117-8/+12
* | | | | | | | | | | 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 'fix-pdflab-paths' into 'master' Jacob Schatz2017-04-122-156/+171
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status