summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Layer dropdowns over right sidebar27639-emoji-panel-under-the-side-panel-in-the-merge-requestSam Rose2017-02-062-1/+5
|
* Merge branch 'traits-for-featurs' into 'master'Robert Speicher2017-02-0625-78/+62
|\ | | | | | | | | | | | | Add traits for ProjectFeatures to Project factory Closes #24007 See merge request !8925
| * Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-0525-78/+62
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/24007
* | Merge branch '27685-update_ha_docs' into 'master' Marin Jankovski2017-02-061-9/+9
|\ \ | | | | | | | | | | | | | | | | | | Update NFS HA doc with location -> config mapping Closes #27685 See merge request !8993
| * | Map configuration to directory locations and add defaults to NFS HA doc.27685-update_ha_docsMarin Jankovski2017-02-061-9/+9
| | |
* | | Merge branch 'merge-request-environment-list-spec' into 'master' Robert Speicher2017-02-061-15/+38
|\ \ \ | | | | | | | | | | | | | | | | Added specs for merge request environment list See merge request !8937
| * | | Added specs for merge request environment listmerge-request-environment-list-specPhil Hughes2017-02-031-15/+38
| | | | | | | | | | | | | | | | Ported from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1154
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-02-0623-235/+2715
|\ \ \ \
| * \ \ \ Merge branch 'snippet-spam-fix' into 'master' Rémy Coutable2017-02-062-23/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't render snippet actions for logged-out users Closes #27708 See merge request !8995
| | * | | | Don't render snippet actions for logged-out userssnippet-spam-fixSean McGivern2017-02-062-23/+25
| | | | | |
| * | | | | Merge branch '26863-Remove-hover-animation-from-row-elements' into 'master' Annabel Dunstone Gray2017-02-062-5/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove hover animation from row elements" Closes #26863 See merge request !8842
| | * | | | | Removed additional dropdown list animations26863-Remove-hover-animation-from-row-elementsdimitrieh2017-02-061-1/+4
| | | | | | |
| | * | | | | removed commented out scssdimitrieh2017-01-271-5/+0
| | | | | | |
| | * | | | | Remove hover animation from row elementsdimitrieh2017-01-272-4/+12
| | | | | | |
| * | | | | | Merge branch '9-0-api-changes' into 'master' Sean McGivern2017-02-0613-184/+2647
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V4 API: Remove deprecated MR and Issue endpoints and preserve V3 namespace Closes #27180 See merge request !8967
| | * | | | | | Remove deprecated MR and Issue endpoints and preserve V3 namespace9-0-api-changesOswaldo Ferreira2017-02-0613-184/+2647
| | | | | | | |
| * | | | | | | Merge branch 'pms-lowercase-system-notes' into 'master'Sean McGivern2017-02-063-14/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all system notes lowercase See merge request !8807
| | * | | | | | | Add changelog filepms-lowercase-system-notesOswaldo Ferreira2017-02-061-0/+4
| | | | | | | | |
| | * | | | | | | Update system_note_service_spec.rbPedro Moreira da Silva2017-02-061-5/+5
| | | | | | | | |
| | * | | | | | | Remove noteable object in time tracking system notes [ci-skip]Pedro Moreira da Silva2017-02-061-8/+8
| | | | | | | | |
| | * | | | | | | Make all system notes lowercasePedro Moreira da Silva2017-02-061-8/+12
| | |/ / / / / /
| * | | | | | | Merge branch 'redesign-searchbar-admin-project-26794' into 'master'Jacob Schatz2017-02-063-9/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the search bar area on admin/projects page Closes #26794 See merge request !8776
| | * | | | | | | fixes mobile viewredesign-searchbar-admin-project-26794Nur Rony2017-01-311-1/+1
| | | | | | | | |
| | * | | | | | | adds changelogNur Rony2017-01-311-0/+4
| | | | | | | | |
| | * | | | | | | hides search buttonNur Rony2017-01-311-0/+1
| | | | | | | | |
| | * | | | | | | layout rearrangedNur Rony2017-01-301-8/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-02-0636-91/+2082
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch '27602-fix-avatar-border-flicker-mention-dropdown' into 'master'Jacob Schatz2017-02-063-0/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves user avatar flickers as you type Closes #27602 See merge request !8950
| | * | | | | | | adds changelog27602-fix-avatar-border-flicker-mention-dropdownNur Rony2017-02-031-0/+4
| | | | | | | | |
| | * | | | | | | fixes flickers in avatar mention dropdownNur Rony2017-02-032-0/+22
| | | | | | | | |
| * | | | | | | | Merge branch 'babel-all-the-things' into 'master' Fatih Acet2017-02-063-4/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use babel to transpile all non-vendor javascript assets regardless of file extension See merge request !8988
| | * | | | | | | | add CHANGELOG entry for !8988babel-all-the-thingsMike Greiling2017-02-061-0/+5
| | | | | | | | | |
| | * | | | | | | | transpile all javascript files with babelMike Greiling2017-02-061-2/+2
| | | | | | | | | |
| | * | | | | | | | add npm run webpack commandMike Greiling2017-02-061-2/+4
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'fix-ace-editor-modules' into 'master' Fatih Acet2017-02-061-8/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | fix ace editor modules to include asset digest in production See merge request !8869
| | * | | | | | | lazy-load ace config so that we can ensure window.gon existsfix-ace-editor-modulesMike Greiling2017-02-051-10/+17
| | | | | | | | |
| | * | | | | | | fix ace editor modules to include asset digest in productionMike Greiling2017-02-051-2/+4
| | |/ / / / / /
| * | | | | | | Merge branch 'terminal-max-session-time' into 'master' Kamil Trzciński2017-02-0616-13/+107
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce maximum session time for terminal websocket connection Closes #26263 See merge request !8413
| | * | | | | | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-0616-13/+107
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the value in application settings. Expose the value to Workhorse.
| * | | | | | | Merge branch '22007-unify-projects-search' into 'master' Rémy Coutable2017-02-069-65/+1910
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify projects search by removing /projects/:search endpoint Closes #22007 See merge request !8877
| | * | | | | | | Adjust V3 projects typo on spec22007-unify-projects-searchOswaldo Ferreira2017-02-031-1/+1
| | | | | | | | |
| | * | | | | | | Update V3 to V4 docsOswaldo Ferreira2017-02-022-0/+11
| | | | | | | | |
| | * | | | | | | Remain V3 endpoint unchangedOswaldo Ferreira2017-01-304-3/+1895
| | | | | | | | |
| | * | | | | | | Unify projects search by removing /projects/:search endpointOswaldo Ferreira2017-01-303-62/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'api-fix-files' into 'master' Rémy Coutable2017-02-064-1/+11
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | API: Fix file downloading See merge request !8953
| | * | | | | | | Ensure the right content is served for the build artifacts APIapi-fix-filesRobert Schilling2017-02-052-0/+6
| | | | | | | | |
| | * | | | | | | API: Fix file downloadingRobert Schilling2017-02-032-1/+5
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-02-06545-4330/+8609
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'sh-add-index-for-label-count' into 'master' Yorick Peterse2017-02-052-1/+13
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index to labels for `type` and project_id` Closes #27676 See merge request !8978
| | * | | | | | Add index to labels for `type` and project_id`sh-add-index-for-label-countStan Hu2017-02-042-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading pages that display the number of open issues, the backend runs a query such as: ```sql SELECT "labels"."id" FROM "labels" WHERE "labels"."type" IN ('ProjectLabel') AND "labels"."project_id" = 1000 ``` This results in an entire scan of the `labels` table. To optimize performance, add the appropriate index to the table. Closes #27676