| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 5 | -14/+75 |
| |\ | |||||
| | * | Merge branch 'optimise-builds' into 'master' | Sean McGivern | 2017-04-07 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546 | ||||
| | | * | Count number of queries | Kamil Trzcinski | 2017-04-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 4 | -13/+74 |
| | |\ \ | | |/ | |/| | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | ||||
| | | * | Protected tags changes from backend maintainer review | James Edwards-Jones | 2017-04-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 2 | -0/+75 |
| | | |\ | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml | ||||
| | | * | | Protected Tags backend review changes | James Edwards-Jones | 2017-04-06 | 3 | -0/+3 |
| | | | | | | | | | | | | | Added changelog | ||||
| | | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 5 | -2/+25 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss | ||||
| | | * | | | Fixed UserAccess#can_create_tag? after create_access_levels rename | James Edwards-Jones | 2017-04-04 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Cleaned up duplication with ProtectedRefAccess concern | James Edwards-Jones | 2017-04-04 | 3 | -44/+18 |
| | | | | | | |||||
| | | * | | | Cleanup & tests for UserAccess#can_create_tag? | James Edwards-Jones | 2017-04-04 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fixed developers_can_push in RepoBranch API entity | James Edwards-Jones | 2017-04-04 | 1 | -0/+6 |
| | | | | | | |||||
| | | * | | | Fix typos in ProtectedRef concern and whitespace detected by rubocop | James Edwards-Jones | 2017-04-03 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Clean up non TODO rubocop errors | James Edwards-Jones | 2017-04-03 | 2 | -2/+1 |
| | | | | | | |||||
| | | * | | | Use delegation in ProtectedRef concern | James Edwards-Jones | 2017-04-03 | 1 | -12/+2 |
| | | | | | | |||||
| | | * | | | Extract ProtectedRef Concern | James Edwards-Jones | 2017-04-03 | 1 | -0/+47 |
| | | | | | | |||||
| | | * | | | Settings::RepositoryController includes protected tags in JS | James Edwards-Jones | 2017-03-31 | 1 | -16/+16 |
| | | | | | | |||||
| | | * | | | Protected tags copy/paste from protected branches | James Edwards-Jones | 2017-03-31 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell | ||||
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 1 | -0/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Lin Jen-Shin | 2017-04-07 | 2 | -0/+75 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ... | ||||
| | * | | | | add auto-cancel for pending pipelines on branch, if they are not HEAD | Rydkin Maxim | 2017-04-04 | 1 | -0/+1 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix changelog MR reference add non-HEAD builds finder and add `created` pipelines to scope add spec for auto-cancel non-HEAD pipelines and refactor create_pipeline_service_spec more refactoring for spec adds option for auto-cancel into CI/CD settings fix spec to new configuration fix rubocop fix schema.rb fix schema.rb replace Gitlab 9.0 with 9.1 in doc change wording on pipeline settings added auto_canceled_by field as identifier of autocancel subject remove unnecessary index replace service with retry_lock replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model) fix schema.rb fix schema.rb remove projekt attribute and clean up spec clean up spec withcouple of shared examples added spec for "It does not cancel current pipeline" scenario add some specs to auto-cancel add spec for another branch pipelines | ||||
| * | | | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 2 | -0/+75 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml | ||||
| | * | | | Merge branch '28695-move-all-associated-records-to-ghost-user' into 'master' | Douwe Maan | 2017-04-06 | 1 | -0/+7 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deleting a user shouldn't delete associated records" Closes #28695 and #30514 See merge request !10467 | ||||
| | | * | | | Move a user's award emoji to the ghost user | Timothy Andrew | 2017-04-06 | 1 | -0/+7 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... when the user is destroyed. 1. Normally, for a given awardable and award emoji name, a user is only allowed to create a single award emoji. 2. This validation needs to be removed for ghost users, since: - User A and User B have created award emoji - with the same name and against the same awardable - User A is deleted. Their award emoji is moved to the ghost user - User B is deleted. Their award emoji needs to be moved to the ghost user. However, this breaks the uniqueness validation, since the ghost user is only allowed to have one award emoji of a given name for a given awardable | ||||
| | * | | | use more explicit and explanatory sql statement | Alexis Reigel | 2017-04-06 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | check all groups for 2fa requirement | Alexis Reigel | 2017-04-06 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | add method to get a full routable hierarchy | Alexis Reigel | 2017-04-06 | 1 | -0/+68 |
| | |/ / | |||||
| * | | | Refactor resolvability checks based on type | Douwe Maan | 2017-04-06 | 4 | -21/+34 |
| | | | | |||||
| * | | | Remove and ignore notes.original_discussion_id column | Douwe Maan | 2017-04-05 | 1 | -0/+28 |
| | | | | |||||
| * | | | Address review comments | Douwe Maan | 2017-04-05 | 5 | -1/+54 |
| | | | | |||||
| * | | | Address review comments | Douwe Maan | 2017-04-05 | 2 | -7/+11 |
| | | | | |||||
| * | | | Don't use original_discussion_id | Douwe Maan | 2017-04-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Extract commonalities between DiffDiscussion and LegacyDiffDiscussion | Douwe Maan | 2017-04-05 | 2 | -0/+135 |
| | | | | |||||
| * | | | Add specs | Douwe Maan | 2017-04-05 | 1 | -4/+11 |
| | | | | |||||
| * | | | Add option to start a new discussion on an MR | Douwe Maan | 2017-04-05 | 3 | -8/+78 |
| |/ / | |||||
| * | | Move methods that are not related to mirroring to the repository model | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -19/+5 |
| | | | |||||
| * | | Rename skip_metrics to imported on the importable concern | Douglas Barbosa Alexandre | 2017-04-03 | 2 | -3/+3 |
| | | | |||||
| * | | Skip MR metrics when importing projects from GitHub | Douglas Barbosa Alexandre | 2017-04-03 | 2 | -1/+5 |
| | | | |||||
| * | | Fetch GitHub project as a mirror to get all refs at once | Douglas Barbosa Alexandre | 2017-04-03 | 1 | -0/+31 |
| | | | |||||
| * | | Merge branch '29483-spam-check-only-title-and-description' into 'master' | Sean McGivern | 2017-03-22 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Spam check only when Snippet / Issue "title" or "description" are changed Closes #29483 and #29645 See merge request !10104 | ||||
| | * | | Present ajax call errors when failing to update an Issue | Oswaldo Ferreira | 2017-03-21 | 1 | -1/+1 |
| | |/ | |||||
| * | | Prevented error on nil author from Issuable delegation | James Edwards-Jones | 2017-03-21 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'fix/gb/pipeline-intermittent-running-status' into 'master' | Kamil Trzciński | 2017-03-21 | 1 | -0/+1 |
| |\ \ | |/ |/| | | | | | | | | | Fix pipeline status for transition between stages Closes #29699 See merge request !10094 | ||||
| | * | Fix pipeline status for transition between stages | Grzegorz Bizon | 2017-03-20 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-20 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | Merge branch '28058-hide-emails-in-atom-feeds' into 'security' | Rémy Coutable | 2017-03-20 | 1 | -0/+2 |
| | |/ | | | | | | | | | | | Only show public emails in atom feeds See merge request !2066 | ||||
| * | | Remove repeated routes.path check for postgresql database | mhasbini | 2017-03-18 | 1 | -4/+6 |
| |/ | |||||
| * | Added labels to the issue web hook | Luke "Jared" Bennett | 2017-03-17 | 1 | -0/+1 |
| | | |||||
| * | Allow sorting by due date and label priority | Sean McGivern | 2017-03-15 | 1 | -3/+30 |
| | | |||||
| * | [Issue sorting]Addressed review commentsfix_relative_position_calculation | Valery Sizov | 2017-03-14 | 1 | -23/+54 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |