summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove issue and MR counts from labels indexremove-issue-and-mr-counts-from-labels-pageSean McGivern2017-02-171-6/+4
* Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-1725-597/+108
|\
| * Cache js selectors; fix css26200-convert-sidebar-to-dropdownAnnabel Dunstone Gray2017-02-163-12/+16
| * Move necessary sidebar code to right_sidebar.js; delete sidebar.jsAnnabel Dunstone Gray2017-02-153-22/+12
| * Change iteration strategy to make PhantomJS happyAlfredo Sumaran2017-02-151-2/+4
| * Make active links bold; fix badge stylingAnnabel Dunstone Gray2017-02-152-18/+33
| * Drop theme ID from users tableAnnabel Dunstone Gray2017-02-153-3/+0
| * Fix dropdown alignmentAnnabel Dunstone Gray2017-02-151-6/+5
| * Remove sidebar toggle button; replace with dropdownAnnabel Dunstone Gray2017-02-152-16/+14
| * Remove global sidebar stylesAnnabel Dunstone Gray2017-02-156-121/+10
| * Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-1512-274/+3
| * Remove all unnecessary sidebar.jsAnnabel Dunstone Gray2017-02-151-91/+0
| * Remove pinned nav functionality and side_navbar_classAnnabel Dunstone Gray2017-02-152-32/+1
| * Add dropdown toggle buttonAnnabel Dunstone Gray2017-02-152-39/+49
* | Merge branch '26824-diff-unfold-link-is-still-visible-when-there-are-no-lines...Filipa Lacerda2017-02-174-9/+14
|\ \
| * | prevent diff unfolding link from appearing for deleted filesMike Greiling2017-02-162-2/+2
| * | fix build failuresMike Greiling2017-02-161-1/+3
| * | only show diff unfolding link if there are more lines to showMike Greiling2017-02-164-7/+10
* | | Merge branch '27883-autocomplete-seems-to-not-trigger-when-at-character-is-pa...Filipa Lacerda2017-02-171-0/+3
|\ \ \
| * | | Retrigger at.js for slash commands with autocomplete suffix27883-autocomplete-seems-to-not-trigger-when-at-character-is-part-of-an-autocompleted-textSam Rose2017-02-131-0/+3
* | | | Merge branch '28248-use-page' into 'master' Robert Speicher2017-02-171-3/+2
|\ \ \ \
| * | | | Reduce number of pipelines created to test pagination28248-use-pageFilipa Lacerda2017-02-161-1/+1
| * | | | Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1618-58/+67
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1646-1199/+1418
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-151-1/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Use `page` query parameter instead of `p` to keep consistency with all URLsFilipa Lacerda2017-02-151-2/+2
* | | | | | | Merge branch '28059-add-pagination-to-admin-abuse-reports' into 'master' Alfredo Sumaran2017-02-161-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Restore pagination to admin abuse reportsEric Eastwood2017-02-161-0/+1
* | | | | | | | Merge branch 'add-issues-button-disable' into 'master' Fatih Acet2017-02-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Disables add issue buttonadd-issues-button-disablePhil Hughes2017-02-091-1/+1
* | | | | | | | Merge branch 'fix-pipelines-pagination-is-gone' into 'master' Alfredo Sumaran2017-02-162-2/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Renders pagination again for pipelines tableFilipa Lacerda2017-02-162-2/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'active_when' into 'master' Robert Speicher2017-02-1616-55/+61
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add active_when helperSemyon Pupkov2017-02-1516-55/+61
| | |/ / / / | |/| | | |
* | | | | | Merge branch '28262-horizontal-scrolling-issue-on-long-project-names' into 'm...Annabel Dunstone Gray2017-02-161-0/+1
|\ \ \ \ \ \
| * | | | | | Wrap long Project and Group titles28262-horizontal-scrolling-issue-on-long-project-namesSam Rose2017-02-161-0/+1
* | | | | | | Merge branch '28247-timeloops-bug' into 'master' Clement Ho2017-02-164-50/+33
|\ \ \ \ \ \ \
| * | | | | | | Transforms startTimeAgoLoops into a static method so we can reuse it instead ...Filipa Lacerda2017-02-163-9/+5
| * | | | | | | Only run timeago loops after rendering timeago componentsFilipa Lacerda2017-02-164-43/+30
* | | | | | | | Merge branch '28253-fix-buid-scroll-button-position' into 'master' Annabel Dunstone Gray2017-02-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix positioning of top scroll buttonAlfredo Sumaran2017-02-161-1/+1
* | | | | | | | | Merge branch '27281-devicon' into 'master'Robert Speicher2017-02-163-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dev favicon is blue, not purple27281-deviconSimon Knox2017-02-162-1/+1
| * | | | | | | | | override favicon for development to find tabs more easilySimon Knox2017-02-163-1/+5
* | | | | | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-163-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-153-3/+15
* | | | | | | | | | | Merge branch '26957-tanuki-anim-hang' into 'master' Clement Ho2017-02-163-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | don't trigger tanuki loader when downloading files26957-tanuki-anim-hangSimon Knox2017-02-163-6/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '27986-text-spacing' into 'master' Filipa Lacerda2017-02-161-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add space between ci text and commit sha in Merge Request widget27986-text-spacingSimon Knox2017-02-171-1/+1
| |/ / / / / / / / /