summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'New merge request' button for users who don't have push access to ↵dm-empty-state-new-merge-requestDouwe Maan2017-06-292-3/+10
| | | | canonical project
* Merge branch '33961-blank-section' into 'master'Phil Hughes2017-06-291-1/+12
|\ | | | | | | | | | | | | Move verification to block level instead of paragraph Closes #33961 See merge request !12519
| * 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-295-2/+19
|\ | | | | | | | | | | | | 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-275-2/+19
| | | | | | | | | | | | | | | | | | 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 'master' into 'master'Rémy Coutable2017-06-291-3/+3
|\ \ | | | | | | | | | | | | Update README.md to reflect where "Secret variables" are located See merge request !12540
| * | Update README.md to reflect where "Secret variables" are locatedSean2017-06-281-3/+3
| | |
* | | 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-293-26/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-293-26/+47
| | | | | | | | | | | | | | | | | | | | search list
* | | | | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'Douwe Maan2017-06-294-2/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-2/+43
| | | | | |
* | | | | | Merge branch 'refactor/declarative-policy' into 'master'Sean McGivern2017-06-2952-971/+2285
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/declarative policy See merge request !10515
| * | | | | | add some extremely rough documentationhttp://jneen.net/2017-06-271-0/+116
| | | | | | |
| * | | | | | use subject scope in :id/usershttp://jneen.net/2017-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | since we're loading all the members anyways
| * | | | | | 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-2730-662/+629
| | | | | | |
| * | | | | | implement Presenter::Base#declarative_policy_delegatehttp://jneen.net/2017-06-271-0/+5
| | | | | | |
| * | | | | | update the specs to not require a set to be returnedhttp://jneen.net/2017-06-2712-275/+303
| | | | | | |
| * | | | | | add a new DeclarativePolicy frameworkhttp://jneen.net/2017-06-279-0/+1220
| | | | | | |
* | | | | | | Merge branch ↵Douwe Maan2017-06-294-1/+143
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | Make membership required for create_user_by_membershipShinya Maeda2017-06-281-3/+3
| | | | | | | |
| * | | | | | | Fix saShinya Maeda2017-06-281-3/+1
| | | | | | | |
| * | | | | | | use go instead of let procShinya Maeda2017-06-282-49/+43
| | | | | | | |
| * | | | | | | Fixed typo and hash alighmentShinya Maeda2017-06-282-3/+5
| | | | | | | |
| * | | | | | | Improve description_forShinya Maeda2017-06-281-2/+1
| | | | | | | |
| * | | | | | | Fix static analysisShinya Maeda2017-06-281-1/+1
| | | | | | | |
| * | | | | | | IMprove access_matchersShinya Maeda2017-06-282-26/+24
| | | | | | | |
| * | | | | | | Remove author. Replace Result to Got.Shinya Maeda2017-06-282-2/+2
| | | | | | | |
| * | | | | | | Fix static analysysShinya Maeda2017-06-282-13/+13
| | | | | | | |
| * | | | | | | Resolve static analysisShinya Maeda2017-06-281-2/+2
| | | | | | | |
| * | | | | | | Add changelog. Add AccessMatchersForControllerShinya Maeda2017-06-283-0/+150
| | | | | | | |
| * | | | | | | Use authorize_update_pipeline_schedule in PipelineSchedulesControllerShinya Maeda2017-06-281-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'highest-return-on-diff-investment' into 'master'Sean McGivern2017-06-292-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-1/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'add-members-count-and-parent-id-data-on-namespaces-api' into ↵Douwe Maan2017-06-299-6/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add group members counting related data on namespaces API See merge request !12497
| * | | | | | | | | Improve changelogadd-members-count-and-parent-id-data-on-namespaces-apiOswaldo Ferreira2017-06-282-4/+4
| | | | | | | | | |
| * | | | | | | | | Add parent_id back to the testsOswaldo Ferreira2017-06-282-2/+4
| | | | | | | | | |
| * | | | | | | | | Improve tests textOswaldo Ferreira2017-06-282-3/+2
| | | | | | | | | |
| * | | | | | | | | Rename members_count to members_count_with_descendants and expose only to ↵Oswaldo Ferreira2017-06-286-20/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group admins
| * | | | | | | | | Adjust projects spec on namespace fieldsOswaldo Ferreira2017-06-282-2/+6
| | | | | | | | | |
| * | | | | | | | | Add "members_count" and "parent_id" data on namespaces APIOswaldo Ferreira2017-06-286-3/+63
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Rémy Coutable2017-06-293-1/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated' into 'master' Fix a bug where an invalid sort param value was passed to Gitaly Closes #34280 See merge request !12534
| * | | | | | | | | | Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updatedAlejandro Rodríguez2017-06-283-1/+50
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dm-page-image-size' into 'master'Rémy Coutable2017-06-292-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit OpenGraph image size to 64x64 See merge request !12541
| * | | | | | | | | | Limit OpenGraph image size to 64x64dm-page-image-sizeDouwe Maan2017-06-282-0/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dm-relative-submodule-url-trailing-whitespace' into 'master'Rémy Coutable2017-06-293-0/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip trailing whitespace in relative submodule URL Closes #34347 See merge request !12531
View Lorry Controller Status