- Feb 14, 2018
-
-
Sean McGivern authored
Before, this would: 1. Not use the correct reference for non-JIRA external trackers. 2. Append 'Closes ' if an external tracker was enabled, but no issue matched the branch name.
-
- Feb 13, 2018
-
-
Stan Hu authored
When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193
-
- Feb 07, 2018
-
-
Ahmad Sherif authored
Fixes #37439 Fixes gitaly#1000
-
- Feb 02, 2018
-
-
Andrew McCallum authored
-
- Feb 01, 2018
-
-
Oswaldo Ferreir authored
-
- Jan 29, 2018
-
-
Oswaldo Ferreir authored
-
- Jan 17, 2018
-
-
Jarka Kadlecova authored
-
Sean McGivern authored
check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
-
- Jan 10, 2018
-
-
Sean McGivern authored
-
- Jan 09, 2018
-
-
Jan Provaznik authored
Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
-
Benedikt Huss authored
-
- Jan 05, 2018
-
-
Jan Provaznik authored
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
-
- Jan 02, 2018
-
-
Oswaldo Ferreir authored
-
- Dec 27, 2017
-
-
Alejandro Rodríguez authored
-
- Dec 07, 2017
-
-
micael.bergeron authored
add a spec for commit merge request diff notes
-
- Dec 05, 2017
-
-
Jarka Kadlecova authored
-
Jan Provaznik authored
* new merge request can be created by sending an email to the specific email address (similar to creating issues by email) * for the first iteration, source branch must be specified in the mail subject, other merge request parameters can not be set yet * user should enable "Receive notifications about your own activity" in user settings to receive a notification about created merge request Part of #32878
-
- Nov 28, 2017
-
-
Sean McGivern authored
If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
-
- Nov 25, 2017
-
-
Vitaliy @blackst0ne Klachkov authored
-
- Nov 24, 2017
-
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
- Nov 23, 2017
-
-
Felipe Artur authored
-
Sean McGivern authored
Compared to the merge_request_diff association: 1. It's simpler to query. The query uses a foreign key to the merge_request_diffs table, so no ordering is necessary. 2. It's faster for preloading. The merge_request_diff association has to load every diff for the MRs in the set, then discard all but the most recent for each. This association means that Rails can just query for N diffs from N MRs. 3. It's more complicated to update. This is a bidirectional foreign key, so we need to update two tables when adding a diff record. This also means we need to handle this as a special case when importing a GitLab project. There is some juggling with this association in the merge request model: * `MergeRequest#latest_merge_request_diff` is _always_ the latest diff. * `MergeRequest#merge_request_diff` reuses `MergeRequest#latest_merge_request_diff` unless: * Arguments are passed. These are typically to force-reload the association. * It doesn't exist. That means we might be trying to implicitly create a diff. This only seems to happen in specs. * The association is already loaded. This is important for the reasons explained in the comment, which I'll reiterate here: if we a) load a non-latest diff, then b) get its `merge_request`, then c) get that MR's `merge_request_diff`, we should get the diff we loaded in c), even though that's not the latest diff. Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases, but not quite all.
-
- Nov 20, 2017
-
-
Oswaldo Ferreir authored
-
- Nov 16, 2017
-
-
Jacopo authored
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
-
Oswaldo Ferreir authored
-
- Nov 15, 2017
-
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
- Nov 10, 2017
-
-
Felipe Artur authored
-
- Nov 02, 2017
-
-
Jarka Kadlecova authored
-
- Oct 30, 2017
-
-
Rob Ede authored
-
- Oct 27, 2017
-
-
Oswaldo Ferreir authored
-
- Oct 16, 2017
-
-
Sean McGivern authored
When a build is retried automatically, we close any open todos. However, we do that _before_ creating a new build failed todo. To solve this, we check if the build is retried before creating the todo. We also ensure that the build _instance_ has the correct attribute set, without needing to reload it from the database.
-
- Oct 13, 2017
-
-
Alejandro Rodríguez authored
Rename classes to (hopefully) clearer names while we're doing that.
-
Alejandro Rodríguez authored
This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
-
Alejandro Rodríguez authored
-
- Oct 12, 2017
-
-
Micael Bergeron authored
-
Micael Bergeron authored
-
- Oct 11, 2017
-
-
micael.bergeron authored
-
- Oct 09, 2017
-
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
- Sep 28, 2017
-
-
Sean McGivern authored
Before this change, the MR counter in the sidebar would be wrong if an MR had been merged since the last update, but not opened or closed, as merging did not trigger a counter cache update.
-