summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28236-browse-button-dropping' into 'master' Fatih Acet2017-02-171-1/+1
|\
| * Increase right side of file header to accommodate browse files button28236-browse-button-droppingAnnabel Dunstone Gray2017-02-161-1/+1
* | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-173-1/+4
|\ \
| * | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-143-1/+4
* | | Merge branch '28303-change-development-tanuki-favicon-colors-to-match-logo' i...Annabel Dunstone Gray2017-02-171-0/+0
|\ \ \
| * | | Change development tanuki favicon colors to match logo color order28303-change-development-tanuki-favicon-colors-to-match-logodimitrieh2017-02-171-0/+0
* | | | Merge branch 'fix/gb/pipeline-retry-cancel-buttons-consistency' into 'master' Kamil Trzciński2017-02-171-2/+2
|\ \ \ \
| * | | | Reuse pipeline methods to preserve Law of DemeterGrzegorz Bizon2017-02-141-2/+2
* | | | | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-175-13/+36
|\ \ \ \ \
| * | | | | Adding links to user & build in Chat NotificationsPoornima M2017-01-255-13/+36
* | | | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-174-14/+29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-15302-1778/+3122
| |\ \ \ \ \ \
| * | | | | | | Only tick queue if anything is updatedLin Jen-Shin2017-02-071-2/+2
| * | | | | | | Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-07214-555/+2817
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-04390-1549/+3441
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove the key from the queue when runner is deletedLin Jen-Shin2017-01-211-0/+8
| * | | | | | | | | Prefer service object over after_save hookLin Jen-Shin2017-01-214-14/+21
* | | | | | | | | | 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
| | |/ / / / / / / / / / | |/| | | | | | | | | |