summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-103-6/+0
|
* Remove an unused `Issue.open_for` scopeRobert Speicher2017-04-102-10/+0
|
* Merge branch 'ci-favicon-back-in' into 'master' Filipa Lacerda2017-04-102-3/+5
|\ | | | | | | | | Added back in the CI status favicon See merge request !10534
| * Fixed karmaci-favicon-back-inPhil Hughes2017-04-101-3/+3
| |
| * Added back in the CI status faviconPhil Hughes2017-04-101-0/+2
| | | | | | | | Looks like it was removed with a bad merge conflict resolution
* | Merge branch 'file-view-container' into 'master' Jacob Schatz2017-04-101-3/+3
|\ \ | | | | | | | | | | | | Remove limited container on file view See merge request !10542
| * | Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
| | |
* | | Merge branch 'alkuzad/gitlab-ce-namespaces_encoding_docs' into 'master' Achilleas Pipinellis2017-04-1025-193/+203
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add information about namespace encoding to API docs Closes #25722 See merge request !10536
| * | | Add URL encoding link to issues APIAchilleas Pipinellis2017-04-101-15/+15
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix wrong copy edits for URL-encoded substitutions in API docsalkuzad/gitlab-ce-namespaces_encoding_docsAchilleas Pipinellis2017-04-1014-77/+77
| | | |
| * | | Mention URL path encoding to all API docsAchilleas Pipinellis2017-04-0824-161/+161
| | | |
| * | | Add information about namespace encoding to API docsDawid Goslawski2017-04-0810-102/+112
| | | |
* | | | Merge branch 'spec_for_schema' into 'master' Rémy Coutable2017-04-102-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for schema.rb Closes #21978 See merge request !10580
| * | | | Add spec for schema.rbblackst0ne2017-04-102-0/+27
| | | | |
* | | | | Merge branch 'test-all-etag-routes' into 'master' Sean McGivern2017-04-103-34/+124
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test all enabled routes in ETag caching middleware and fix pipeline routes Closes #30563 See merge request !10535
| * | | | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-103-34/+124
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract route matching logic to Gitlab::EtagCaching::Router. Fix pipeline routes: 1. "project_pipelines" has to come after "commit_pipelines" and "merge_request_pipelines" because it is more generic 2. "commit_pipelines": "\s" (any whitespace character) => "\S" (any non-whitespace character).
* | | | | Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-102-1/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
| * | | | Fix email not being sent after project exportmhasbini2017-04-092-1/+17
| | |/ / | |/| |
* | | | Merge branch 'clean_carrierwave_tempfiles' into 'master'Rémy Coutable2017-04-104-5/+28
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Clean carrierwave tempfiles Closes #28540 See merge request !9466
| * | | Periodically clean up temporary upload files to recover storage spaceblackst0ne2017-04-104-5/+28
|/ / /
* | | Merge branch 'refactor-behaviors' into 'master' Alfredo Sumaran2017-04-097-205/+185
|\ \ \ | | | | | | | | | | | | | | | | Refactor javascript behaviors directory See merge request !10439
| * | | consolidate all behavior imports into an index.js filerefactor-behaviorsMike Greiling2017-04-042-8/+10
| | | |
| * | | refactor and fix eslint violations in behaviors directoryMike Greiling2017-04-045-197/+175
| | | |
* | | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-0924-40/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * | | | Remove the User#is_admin? methodblackst0ne2017-04-0924-40/+40
| | |/ / | |/| |
* | | | Merge branch 'add-field-for-group-name' into 'master' Alfredo Sumaran2017-04-0912-23/+88
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add a name field to the group edit form See merge request !10502
| * | | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-0912-23/+88
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* | | Merge branch 'new-resolvable-discussion' into 'master' Douwe Maan2017-04-08140-2225/+4037
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add option to start a new resolvable discussion in an MR Closes #24378 See merge request !7527
| * \ \ Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0738-697/+881
| |\ \ \
| * | | | Fix specsDouwe Maan2017-04-072-2/+2
| | | | |
| * | | | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
| | | | |
| * | | | Revert yarn.lock changesLuke "Jared" Bennett2017-04-072-273/+2055
| | | | |
| * | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07123-480/+1883
| |\ \ \ \
| * | | | | Rever yarn.lock changesLuke "Jared" Bennett2017-04-071-2075/+276
| | | | | |
| * | | | | Review changesLuke "Jared" Bennett2017-04-074-9/+34
| | | | | |
| * | | | | Fix firefox overflow css bugLuke "Jared" Bennett2017-04-071-0/+1
| | | | | |
| * | | | | Fix bug where commit comment would not show up in the right discussion on ↵Douwe Maan2017-04-072-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | the MR page
| * | | | | Fix creating discussion when diff view is set to parallelDouwe Maan2017-04-072-27/+20
| | | | | |
| * | | | | Fix view specDouwe Maan2017-04-071-2/+2
| | | | | |
| * | | | | Update schema.rbDouwe Maan2017-04-071-1/+1
| | | | | |
| * | | | | Add link to list itemsLuke "Jared" Bennett2017-04-072-15/+28
| | | | | |
| * | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0767-309/+1225
| |\ \ \ \ \
| * | | | | | Added variable button fixLuke "Jared" Bennett2017-04-073-20/+38
| | | | | | |
| * | | | | | Fixed issue button state bugLuke "Jared" Bennett2017-04-075-80/+121
| | | | | | |
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07229-1046/+1847
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-07466-2918/+9189
| | |\ \ \ \ \ \
| * | | | | | | | Fixed bugs and added testsLuke "Jared" Bennett2017-04-076-15/+33
| | | | | | | | |
| * | | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-074-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Renamed spec filesLuke "Jared" Bennett2017-04-074-0/+0
| | | | | | | | |
| * | | | | | | | Finish up feature specLuke "Jared" Bennett2017-04-074-65/+63
| | | | | | | | |
View Lorry Controller Status