summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Issue dropdown persists when adding issue number to issue description"Tim Zallmann2017-06-293-1/+18
|
* Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-291-0/+18
|\ | | | | | | | | Added code for defining SHA attributes See merge request !12555
| * Added code for defining SHA attributesYorick Peterse2017-06-291-0/+18
| | | | | | | | | | | | These attributes are stored in binary in the database, but exposed as strings. This allows one to query/create data using plain SHA1 hashes as Strings, while storing them more efficiently as binary.
* | Merge branch 'refactor-namespace-default-scope-override' into 'master'Douwe Maan2017-06-291-3/+1
|\ \ | | | | | | | | | | | | Remove Namespace model default scope override and write additional test to Project search See merge request !12546
| * | Remove Namespace model default scope override and write additional test to ↵refactor-namespace-default-scope-overrideTiago Botelho2017-06-291-3/+1
| | | | | | | | | | | | Project search
* | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-293-27/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" Closes #34511 See merge request !12557
| * | | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-293-27/+4
| | | | | | | | | | | | | | | | | | | | This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* | | | Move verification to block level instead of paragraphFilipa Lacerda2017-06-291-1/+12
| | | |
* | | | Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'Kamil Trzciński2017-06-291-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only count GL pipelines in usage data ping Closes #33172 See merge request !12277
| * | | | Split pipelines by origin on usage datazj-usage-ping-only-gl-pipelinesZ.J. van de Weg2017-06-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending the usage data, it now includes all pipelines. This commit will split the pipelines in two; internal and external. This will lead to historical data being incorrectly marked this way. Fixes gitlab-org/gitlab-ce#33172
* | | | | Merge branch 'sidebar-header-no-conflicts' into 'master'Phil Hughes2017-06-295-1/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Sidebar header no conflicts See merge request !12524
| * | | | | Minor editssidebar-header-no-conflictsAnnabel Dunstone Gray2017-06-293-4/+3
| | | | | |
| * | | | | Make header into links; CSS tweaksAnnabel Dunstone Gray2017-06-285-8/+14
| | | | | |
| * | | | | Add context header to sidebarAnnabel Dunstone Gray2017-06-285-1/+43
| | | | | |
* | | | | | Merge branch '26125-match-username-on-search' into 'master'Douwe Maan2017-06-291-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserts exact matches of username and email to the top of the user search list Closes #26125 See merge request !12525
| * | | | | | Inserts exact matches of username, email and name to the top of the user ↵26125-match-username-on-searchTiago Botelho2017-06-291-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | search list
* | | | | | | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'Douwe Maan2017-06-291-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors caused by attempts to report already blocked or deleted users Closes #8928 See merge request !12502
| * | | | | | | Fix errors caused by attempts to report already blocked or deleted usersHoracio Bertorello2017-06-281-1/+13
| | | | | | | |
* | | | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2927-691/+634
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/declarative policy See merge request !10515
| * | | | | | | | convert the special-case Ability methods to use policieshttp://jneen.net/2017-06-271-34/+10
| | | | | | | | |
| * | | | | | | | convert all the policies to DeclarativePolicyhttp://jneen.net/2017-06-2727-657/+624
| | | | | | | | |
* | | | | | | | | Merge branch ↵Douwe Maan2017-06-291-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-in-pipelineschedulescontroller' into 'master' Use authorize_update_pipeline_schedule in PipelineSchedulesController Closes #33082 See merge request !11846
| * | | | | | | | | Use authorize_update_pipeline_schedule in PipelineSchedulesControllerShinya Maeda2017-06-281-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'highest-return-on-diff-investment' into 'master'Sean McGivern2017-06-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back branches badge to main project page Closes #34438 See merge request !12548
| * | | | | | | | | | Bring back branches badge to main project pagehighest-return-on-diff-investmentAdam Niedzielski2017-06-291-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into ↵Douwe Maan2017-06-291-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add group members counting related data on namespaces API See merge request !12497
| * | | | | | | | | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-281-0/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dm-page-image-size' into 'master'Rémy Coutable2017-06-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit OpenGraph image size to 64x64 See merge request !12541
| * | | | | | | | | | | Limit OpenGraph image size to 64x64dm-page-image-sizeDouwe Maan2017-06-281-0/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'dm-relative-submodule-url-trailing-whitespace' into 'master'Rémy Coutable2017-06-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip trailing whitespace in relative submodule URL Closes #34347 See merge request !12531
| * | | | | | | | | | Strip trailing whitespace in relative submodule URLdm-relative-submodule-url-trailing-whitespaceDouwe Maan2017-06-281-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dm-merge-request-creations-controller' into 'master'Sean McGivern2017-06-2943-557/+554
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split up MergeRequestsController See merge request !12150
| * | | | | | | | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-2843-557/+554
| | | | | | | | | |
* | | | | | | | | | Job details won't scroll horizontally to show long linesFilipa Lacerda2017-06-292-4/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-291-17/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform housekeeping only when an import of a fresh project is completed Closes #34417 See merge request !12529
| * | | | | | | | | Perform housekeeping only when an import of a fresh project is completedDouglas Barbosa Alexandre2017-06-281-17/+10
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'postreceive-gl-repository' into 'master'Sean McGivern2017-06-291-18/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gl_repository exclusively on PostReceive Closes gitaly#201 See merge request !12290
| * | | | | | | | | Use gl_repository exclusively as identifier on post-receivepostreceive-gl-repositoryAlejandro Rodríguez2017-06-271-18/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-292-17/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `HasVariable` concern Closes #34314 See merge request !12448
| * | | | | | | | DecuplinShinya Maeda2017-06-282-17/+25
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-2910-12/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors Project#search namespace join Closes #30708 See merge request !12091
| * | | | | | | | Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-285-10/+10
| | | | | | | | |
| * | | | | | | | Fix current feature related specsTiago Botelho2017-06-287-10/+13
| | | | | | | | |
| * | | | | | | | Removes pending delete from filter scopesTiago Botelho2017-06-284-7/+6
| | | | | | | | |
| * | | | | | | | refactors Project#search namespace joinTiago Botelho2017-06-281-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-283-4/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop default ORDER scope when calling a find method on a Sortable model Closes #23079 and #34412 See merge request !12499
| * | | | | | | | | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-283-4/+27
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'acet-fix-job-sidebar-overflow' into 'master'Jacob Schatz2017-06-281-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jobs: Fix job sidebar overflow issue. Closes #34080 See merge request !12366
| * | | | | | | | Jobs: Fix job sidebar overflow issue.acet-fix-job-sidebar-overflowFatih Acet2017-06-211-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch ↵Douwe Maan2017-06-281-1/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'delete_esperanto_translations_of_json_files_generated_from_po_files' into 'master' Delete esperanto translations of json files generated from po files See merge request !12516
View Lorry Controller Status