summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-035-1/+16
|\
| * fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
| * Don't allow merges with new commitsSean McGivern2016-06-015-1/+16
* | Merge branch 'todos-filter-project-delete' into 'master' Douwe Maan2016-06-031-1/+13
|\ \
| * | Reorder the todos because the use of the project finder attempts to order the...DJ Mountney2016-06-021-2/+2
| * | Use the project finder in the todos finder to limit todos to just ones within...DJ Mountney2016-06-022-2/+13
| * | Move filtering todos by projects not pending deletion into a scope on the tod...DJ Mountney2016-06-022-7/+2
| * | Reduce the filters on the todos joins project query by being explicit about t...DJ Mountney2016-06-021-1/+7
| * | Ensure we don't show TODOS for projects pending deleteDJ Mountney2016-06-021-1/+1
* | | Merge branch '13312-remove-issuable-is_assigned' into 'master' Robert Speicher2016-06-031-4/+0
|\ \ \
| * | | Remove unused Issuable#is_assigned? method13312-remove-issuable-is_assignedRémy Coutable2016-06-021-4/+0
* | | | Update tests to match new Code tab logicDmitriy Zaporozhets2016-06-031-1/+1
* | | | Put project Files and Commits tabs under Code tabDmitriy Zaporozhets2016-06-036-17/+15
* | | | Update repository_import_worker.rbJames Lopez2016-06-021-1/+1
* | | | fix some issues and improved error output for forkingJames Lopez2016-06-022-2/+9
* | | | some refactoring and fixing specJames Lopez2016-06-023-6/+8
* | | | fix empty message on shell errorJames Lopez2016-06-021-1/+1
* | | | fix create service error handling - missing setting import status to failedJames Lopez2016-06-021-6/+20
* | | | Merge branch '18031-sidebar-labels-queries' into 'master' Yorick Peterse2016-06-022-5/+9
|\ \ \ \
| * | | | issuable#labels_array explicitly load the labelsPaco Guzman2016-06-022-5/+9
| | |/ / | |/| |
* | | | Merge branch 'rs-todo-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-021-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add tooltips to todo target linksrs-todo-has-tooltipRobert Speicher2016-05-301-1/+3
* | | | Merge branch 'issue_18102' into 'master' Robert Speicher2016-06-021-2/+0
|\ \ \ \
| * | | | Fixes missing number on generated ordered listAlfredo Sumaran2016-06-021-2/+0
* | | | | Refactor. Add tests.Josh Frye2016-06-024-17/+4
* | | | | Invalidate cache on build changeJosh Frye2016-06-022-1/+6
* | | | | Cache project build count. Closes #18032Josh Frye2016-06-022-0/+15
| |_|/ / |/| | |
* | | | Merge branch 'issue-18036' into 'master' Yorick Peterse2016-06-023-2/+27
|\ \ \ \
| * | | | Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-021-1/+1
| * | | | Flush cache in callback. Add testsJosh Frye2016-06-022-4/+17
| * | | | Cache assigned open issue count. Closes #18035Josh Frye2016-06-022-3/+9
| * | | | Cache assigned merge request count. Closes #18036Josh Frye2016-06-022-1/+7
| |/ / /
* | | | Merge branch 'search-box-blur' into 'master' Jacob Schatz2016-06-023-18/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Clicking search pill focuses fieldsearch-box-blurPhil Hughes2016-05-243-18/+15
* | | | Merge branch '14446-no_group_avatar-png-link' into 'master' Rémy Coutable2016-06-021-1/+1
|\ \ \ \
| * | | | Fix link to blank group iconSean McGivern2016-06-021-1/+1
* | | | | Fix wiki project clone address errorchujinjin/gitlab-ce-fix_wiki_project_clone_address_errorchujinjin2016-06-021-1/+1
|/ / / /
* | | | Fix indentationConnor Shea2016-06-011-6/+6
* | | | Attempt to fix the user page.Connor Shea2016-06-019-1/+10
* | | | Remove d3 except for on pages where it's necessary.Connor Shea2016-06-019-5/+25
* | | | Merge branch 'fix-dropdown-cutoff' into 'master' Robert Speicher2016-06-021-1/+1
|\ \ \ \
| * | | | Add a title attribute to each branch in the branches dropdown on the New MR p...Connor Shea2016-05-311-1/+1
* | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-024-4/+13
|\ \ \ \ \
| * | | | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-303-2/+11
| * | | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-302-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'downcase-registry-repository' into 'master' Stan Hu2016-06-011-3/+7
|\ \ \ \ \
| * | | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-011-3/+7
| * | | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-011-1/+24
| |\ \ \ \ \
| * | | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-011-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '17187-hover-row' into 'master' Jacob Schatz2016-06-012-4/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |