summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Auto-correct ProjectPathHelper violationsRobert Speicher2017-07-06224-893/+810
|
* Add ProjectPathHelper copDouwe Maan2017-07-063-0/+93
|
* Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_inRobert Speicher2017-06-291-4/+4
| | | | | Also removes `Thread.current[:current_user]` assignment from `gitlab_sign_in_via`
* Change gitlab_sign_out to sign_out where possibleRobert Speicher2017-06-291-3/+3
|
* Remove gitlab_sign_out_direct helperRobert Speicher2017-06-292-7/+2
|
* Remove a duplicated test block from the result of a conflict resolutionRobert Speicher2017-06-291-26/+0
| | | | | This was mistakenly added in 17196a2ff31 and is identical to the group above it.
* Change gitlab_sign_in to sign_in where possibleRobert Speicher2017-06-29284-371/+392
|
* Merge branch ↵Phil Hughes2017-06-294-1/+22
|\ | | | | | | | | | | | | | | | | '34403-issue-dropdown-persists-when-adding-issue-number-to-issue-description' into 'master' Resolve "Issue dropdown persists when adding issue number to issue description" Closes #34403 See merge request !12521
| * Resolve "Issue dropdown persists when adding issue number to issue description"Tim Zallmann2017-06-294-1/+22
|/
* Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'Rémy Coutable2017-06-291-1/+1
|\ | | | | | | | | Run mysql tests on stable preperation branches like 9-3-stable-patch-2 See merge request !12552
| * Run mysql tests on stable preperation branches like 9-3-stable-patch-2jej/run-mysql-tests-on-stable-preparation-branchesJames Edwards-Jones2017-06-291-1/+1
| |
* | Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'Sean McGivern2017-06-296-0/+149
|\ \ | | | | | | | | | | | | Added code for defining SHA attributes See merge request !12555
| * | Added code for defining SHA attributesYorick Peterse2017-06-296-0/+149
| | | | | | | | | | | | | | | | | | 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-292-3/+11
|\ \ \ | | | | | | | | | | | | | | | | 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-292-3/+11
| | | | | | | | | | | | | | | | Project search
* | | | Merge branch 'revert-12499' into 'master'Douwe Maan2017-06-295-52/+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-295-52/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* | | | | 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
| | | | | | | | | | | |
View Lorry Controller Status