summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'issue_14684_2' into 'master' Douwe Maan2016-05-201-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current_user.confirmed_at.present? => current_user.confirmed? fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41 See merge request !4225
| * | | | | | | | current_user.confirmed_at.present? => current_user.confirmed?issue_14684_2Felipe Artur2016-05-201-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan2016-05-2011-47/+281
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
| * | | | | | | | | Address Yorick's feedbackeReGeBe/gitlab-ce-feature/milestone-mdRémy Coutable2016-05-182-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-18767-6387/+11431
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Fix cross-project milestone ref with invalid projectDouwe Maan2016-04-231-11/+17
| | | | | | | | | | |
| * | | | | | | | | | Move changelog itemDouwe Maan2016-04-231-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-mdDouwe Maan2016-04-23162-3280/+2290
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update CHANGELOGAlejandro Rodríguez2016-04-201-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Include Milestone reference syntax in Markdown documentationAlejandro Rodríguez2016-04-201-14/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Using project `path_with_namespace` in milestone's cross project references ↵Alejandro Rodríguez2016-04-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link text
| * | | | | | | | | | | Inserting the Milestone title between quotes on GFM auto completeAlejandro Rodríguez2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to the fact that for multiple word titles it might be an invalid reference without the quotes
| * | | | | | | | | | | Sorting Milestones on the auto complete list by due date and titleAlejandro Rodríguez2016-04-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Inserting Milestone titles insted of IIDs with GFM auto completeAlejandro Rodríguez2016-04-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Matching version-like expressions as `milestone_name`s instead of ↵Alejandro Rodríguez2016-04-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `milestone_iid`s The changes also account for %2.1. being matched as milestone_name = "2.1" without the word-separating dot.
| * | | | | | | | | | | Implementing autocomplete for GFM milestone referencesAlejandro Rodríguez2016-04-203-0/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Escaping the `object_link_text` on cross project milestone referencesAlejandro Rodríguez2016-04-202-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Transforming milestones link references to the short reference formAlejandro Rodríguez2016-04-203-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Consistently using iid when treating milestones as referrablesAlejandro Rodríguez2016-04-203-32/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, addint a suffix to the reference text when the milestone is in another project
| * | | | | | | | | | | Implementing special GitLab markdown reference for milestonesAlejandro Rodríguez2016-04-205-14/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name) to get a link to the referred milestone.
* | | | | | | | | | | | Merge branch 'issue_14632' into 'master' Douwe Maan2016-05-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group visibility level migration in case all visibility levels are restricted fixes #14632 See merge request !4107
| * | | | | | | | | | | | Fix group visibility level migration in case all visibility levels are ↵issue_14632Felipe Artur2016-05-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restricted
* | | | | | | | | | | | | Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-206-8/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let users set notification levels in projects which they are not members Fixes #9013 See merge request !3986
| * | | | | | | | | | | | Use the right default notification settings for non membersissue_9013Felipe Artur2016-05-194-23/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update documentationFelipe Artur2016-05-174-35/+37
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve documentation and add changelogFelipe Artur2016-05-173-10/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Let users set notification levels in projects which they are not membersFelipe Artur2016-05-176-6/+65
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'issue-17537-fix' into 'master' Douwe Maan2016-05-203-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref Closes #17537 See merge request !4151
| * | | | | | | | | | | | | Fix Error 500 when attempting to retrieve project license when HEAD points ↵Stan Hu2016-05-143-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to non-existent ref Closes #17537
* | | | | | | | | | | | | | Merge branch 'rs-issue-3055' into 'master' Douwe Maan2016-05-202-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use extended regexp flag for `git grep`-ing files Closes #3055 See merge request !4203
| * | | | | | | | | | | | | Use extended regexp flag for `git grep`-ing filesrs-issue-3055Robert Speicher2016-05-182-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3055
* | | | | | | | | | | | | | Merge branch 'fix/url-refactor-from-ee' into 'master' Robert Speicher2016-05-201-8/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CE code to include some refactor done in EE to do with import url This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only. See merge request !4223
| * | | | | | | | | | | | | | refactor project to include some nicer EE stufffix/url-refactor-from-eeJames Lopez2016-05-201-8/+3
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'update-db-schema' into 'master' Jeroen van Baarsen2016-05-201-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the DB schema This updates `db/schema.rb` which apparently wasn't fully updated in the recent merge requests. See merge request !4222
| * | | | | | | | | | | | | Updated the DB schemaYorick Peterse2016-05-191-3/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-1922-98/+314
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
| * | | | | | | | | | | | | Use migration helper to prevent downtime migrationfeature/runner-config-untagged-jobsGrzegorz Bizon2016-05-191-8/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Minor runner-related code refactoringsGrzegorz Bizon2016-05-194-21/+22
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rename method that validates runner tag constrainsGrzegorz Bizon2016-05-191-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-192-11/+17
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add minor corrections related to config of runnerGrzegorz Bizon2016-05-194-7/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve setting default runner attrs when using APIGrzegorz Bizon2016-05-191-2/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move runner validator to separate private methodGrzegorz Bizon2016-05-191-6/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use form errors helper in CI runner edit formGrzegorz Bizon2016-05-191-4/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add not null constraint to run untagged runner optionGrzegorz Bizon2016-05-192-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set run untagged option when registering a runnerGrzegorz Bizon2016-05-192-12/+38
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor CI API specs for creating runnerGrzegorz Bizon2016-05-191-17/+29
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add docs for a new configuration setting for runnerGrzegorz Bizon2016-05-191-1/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Extend runner options that are configurable via APIGrzegorz Bizon2016-05-193-5/+13
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add Changelog entry for new runner configurationGrzegorz Bizon2016-05-191-0/+1
| | | | | | | | | | | | | |