- 21 3月, 2016 3 次提交
-
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
- 20 3月, 2016 15 次提交
-
-
由 Grzegorz Bizon 提交于
* master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
-
由 Douwe Maan 提交于
Fix bug where wrong commit ID was being used in a merge request diff to show old image Closes #3769 Closes #14327 See merge request !3300
-
由 Stan Hu 提交于
Closes #3769 Closes #14327
-
由 Jacob Schatz 提交于
Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
-
由 Douwe Maan 提交于
attempting to fix omniauth problem Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361 See merge request !2876
-
由 Douwe Maan 提交于
Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it
😃 > > cautious yes, revert if it’s annoying😉 See merge request !3124 -
由 Douwe Maan 提交于
#to_branch_name now uses the iid as postfix Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember. @DouweM Should this be labelled `pick-in-master`? See merge request !3308
-
由 Grzegorz Bizon 提交于
-
由 Grzegorz Bizon 提交于
Commit 43d8bdb4 introduced additional checks for permissions to read issue in references extractor.
-
由 Grzegorz Bizon 提交于
* master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
-
由 Grzegorz Bizon 提交于
According to endbosses' suggestions.
-
- 19 3月, 2016 22 次提交
-
-
由 Achilleas Pipinellis 提交于
Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation Fixes #14366 /cc @tmaczukin @ayufan @axil See merge request !3277
-
由 Rémy Coutable 提交于
-
由 Rémy Coutable 提交于
-
由 Rémy Coutable 提交于
-
由 Robert Speicher 提交于
Dedupe labels in labels selector in Dashboard pages Fixes #14418. See merge request !3311
-
由 Rémy Coutable 提交于
Also moved useless helper methods and directly to the DashboardController.
-
由 Robert Speicher 提交于
Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
-
由 Rémy Coutable 提交于
-
由 Douwe Maan 提交于
Fix an issue when the target branch of a MR had been deleted Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388. See merge request !3294
-
由 Dmitriy Zaporozhets 提交于
Refactor colors and lists * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3307
-
由 Zeger-Jan van de Weg 提交于
Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember.
-
由 Dmitriy Zaporozhets 提交于
* Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Rémy Coutable 提交于
We have to ensure source_sha and target_sha are not nil before calling Gitlab::Git::Commit.between.
-
由 Rémy Coutable 提交于
Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388.
-
由 Jacob Schatz 提交于
Add avatar to issue and MR pages header closes #14395 # For Issues ### Before ![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png) # For Merge Request ### Before ![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png) See merge request !3301
-
由 Dmitriy Zaporozhets 提交于
Refactor variables Fixes #13803 and other color inconsistency across application cc @jschatz1 @skyruler See merge request !3304
-
由 Douwe Maan 提交于
Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
-
由 Robert Speicher 提交于
Fixes issue with filter label missing on labels & milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407 See merge request !3297
-
由 Arinde Eniola 提交于
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
-