summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-182-85/+70
|\
| * Todo done clicking is kind of unusable.Jacopo2017-02-172-85/+70
* | Merge branch 'global-dropdown-edits' into 'master' Alfredo Sumaran2017-02-171-8/+6
|\ \
| * | Remove badge styling in dropdown; remove blue outlineAnnabel Dunstone Gray2017-02-171-7/+5
| * | Make active links in dropdown boldAnnabel Dunstone Gray2017-02-171-1/+1
* | | Merge branch '23819-fix-milestone-counters-to-top-right-of-panel-headings' in...Clement Ho2017-02-171-0/+20
|\ \ \ | |/ / |/| |
| * | Fix position of counters within milestone panelsAndrew Smith2017-02-151-0/+20
* | | Merge branch 'fix-dependency-in-environments' into 'master' Clement Ho2017-02-174-6/+6
|\ \ \
| * | | Fix depenendencies loading Vue in EEFilipa Lacerda2017-02-174-6/+6
* | | | Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-171-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-171-2/+2
* | | | Merge branch 'task_list_refactor' into 'master' Fatih Acet2017-02-174-91/+67
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-1618-49/+66
| |\ \ \ \
| * | | | | update correct field for Notes - it's called note not descriptionSimon Knox2017-02-154-1/+5
| * | | | | code style and test fixesSimon Knox2017-02-141-0/+0
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-1471-676/+895
| |\ \ \ \ \
| * | | | | | enable lintSimon Knox2017-02-101-4/+1
| * | | | | | forgot to iifeSimon Knox2017-02-081-1/+1
| * | | | | | notes use new task_list, and PATCH instead of POSTSimon Knox2017-02-084-23/+17
| * | | | | | appease lintSimon Knox2017-02-081-9/+8
| * | | | | | switch notes to use task_list, but keep its update function for nowSimon Knox2017-02-082-19/+14
| * | | | | | copypaste task_list setup and events to own classSimon Knox2017-02-073-66/+53
* | | | | | | 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-171-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-141-0/+1
* | | | | | | | | 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 '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-1713-503/+59
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache js selectors; fix css26200-convert-sidebar-to-dropdownAnnabel Dunstone Gray2017-02-162-11/+15
| * | | | | | | | | 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-151-12/+28
| * | | | | | | | | Remove sidebar toggle button; replace with dropdownAnnabel Dunstone Gray2017-02-151-1/+4
| * | | | | | | | | Remove global sidebar stylesAnnabel Dunstone Gray2017-02-156-121/+10
| * | | | | | | | | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-156-257/+0
| * | | | | | | | | Remove all unnecessary sidebar.jsAnnabel Dunstone Gray2017-02-151-91/+0
* | | | | | | | | | 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-162-3/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 28248-use-pageFilipa Lacerda2017-02-1629-1161/+1311
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `page` query parameter instead of `p` to keep consistency with all URLsFilipa Lacerda2017-02-151-2/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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
* | | | | | | | | | | Renders pagination again for pipelines tableFilipa Lacerda2017-02-162-2/+5
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \