summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-12/+20
|\
| * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-12/+20
* | Merge branch 'label-select-toggle' into 'master' kamil-test-branchFatih Acet2017-01-251-1/+5
|\ \
| * | Fixed label select toggle not updating correctlylabel-select-togglePhil Hughes2017-01-161-1/+5
* | | Merge branch '26775-fix-auto-complete-initial-loading' into 'master' Fatih Acet2017-01-251-3/+8
|\ \ \
| * | | Fix autocomplete initial undefined state26775-fix-auto-complete-initial-loadingEric Eastwood2017-01-231-3/+8
* | | | Merge branch '25312-search-input-cmd-click-issue' into 'master' Fatih Acet2017-01-252-8/+13
|\ \ \ \
| * | | | Prevent removing fields from dropdowns on input elementsSam Rose2017-01-252-8/+13
* | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-251-2/+4
|\ \ \ \ \
| * | | | | Return struct instead of multiple valuesKamil Trzcinski2017-01-251-2/+4
| * | | | | Fix picking CI buildsKamil Trzcinski2017-01-251-2/+2
* | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-253-18/+54
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-251-1/+10
| * | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2473-228/+502
| |\ \ \ \ \
| * | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-202-17/+44
* | | | | | | Merge branch '27014-fix-pipeline-tooltip-wrapping' into 'master' Annabel Dunstone Gray2017-01-251-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix mini-pipeline stage tooltip text wrapping27014-fix-pipeline-tooltip-wrappingEric Eastwood2017-01-241-0/+4
* | | | | | | | Display fullscreen button on small screens (!5302)winniehell2017-01-251-1/+1
* | | | | | | | Merge branch 'backport-ee-1067-deal-with-repo-size-limit-as-byte' into 'master' Yorick Peterse2017-01-254-12/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Extract set_project_name_from_path methodbackport-ee-1067-deal-with-repo-size-limit-as-byteOswaldo Ferreira2017-01-231-11/+15
| * | | | | | | | EE backport for new application settings serviceOswaldo Ferreira2017-01-233-1/+19
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-257-8/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-255-4/+30
| * | | | | | | | Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-134-6/+24
* | | | | | | | | Merge branch '22072-enable-haml-linters-phase-2' into 'master' Sean McGivern2017-01-2570-104/+104
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` offenc...22072-enable-haml-linters-phase-2Kushal Pandya2017-01-242-3/+3
| * | | | | | | | | HAMLLint: Fix `RubyComments` offencesKushal Pandya2017-01-246-13/+13
| * | | | | | | | | HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-2425-31/+31
| * | | | | | | | | HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-2442-60/+60
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' Sean McGivern2017-01-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowedToon Claes2017-01-251-1/+0
| * | | | | | | | | Only show Merge Request button when user can create a MRToon Claes2017-01-201-0/+1
* | | | | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-2512-17/+88
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | address commentsJarka Kadlecova2017-01-2510-27/+46
| * | | | | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-182-2/+9
| * | | | | | | | | | Support notes without projectJarka Kadlecova2017-01-188-16/+61
* | | | | | | | | | | Merge branch 'fix_broken_diff_discussions' into 'master' Sean McGivern2017-01-251-3/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make diff discussion more reliablefix_broken_diff_discussionsValery Sizov2016-12-301-3/+5
* | | | | | | | | | | | Merge branch 'filtered-search-hidden-dont-render' into 'master'Jacob Schatz2017-01-251-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Correctly resets the default template on destroyfiltered-search-hidden-dont-renderPhil Hughes2017-01-231-3/+8
| * | | | | | | | | | | | Only render the list if it is visiblePhil Hughes2017-01-231-2/+5
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'filtered-search-keyboard-navigation' into 'master'Jacob Schatz2017-01-256-32/+101
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed replacing with a space after a colonfiltered-search-keyboard-navigationPhil Hughes2017-01-231-1/+1
| * | | | | | | | | | | | Checks if rendered count has changed rather than relying on key charPhil Hughes2017-01-232-8/+15
| * | | | | | | | | | | | Fixed some issues with droplab & keyboard navigationPhil Hughes2017-01-233-23/+50
| * | | | | | | | | | | | Fixed currentIndex being shared across dropdownsPhil Hughes2017-01-231-2/+9
| * | | | | | | | | | | | Changed character matchPhil Hughes2017-01-231-2/+2
| * | | | | | | | | | | | Fixed keyboard navigation not working in filtered search barPhil Hughes2017-01-233-11/+39
* | | | | | | | | | | | | Merge branch 'newline-eslint-rule' into 'master'Jacob Schatz2017-01-253-24/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Flag multiple empty lines in eslint, fix offenses.newline-eslint-ruleBryce Johnson2017-01-243-24/+0