Commit Graph
10148 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8a03cb8744 Lets add more tests to Milestones services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:39:19 +01:00
Dmitriy Zaporozhets 98d6d491b5 Move global milestone specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:38:34 +01:00
Dmitriy Zaporozhets c79d801bf5 Fix a bug when milestone/label filter was empty for dashboard issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 986695e136 Refactor global and group milestones logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 05335a3c85 Create milestones in the group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 1328e4b504 Merge branch 'refactor-duplication' into 'master'
Remove some code duplication

* remove duplicate code in uploaders
* remove duplicate code in NotificationHelper
* remove duplicate code in Repository


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1800
2015-11-16 13:05:49 +00:00
Dmitriy Zaporozhets c9f2f2a483 Fix wrong variable name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 0698c96d7d Remove duplicate code in Repository#*_names_contains
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 433e4a80ef Fix code duplication in NotificationsHelper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 796bb65170 Remove duplicate methods in uploaders
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 13:01:34 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Dmitriy Zaporozhets 6c8dded20b Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitlab-ce 2015-11-16 10:40:49 +01:00
Robert Speicher 9337da7864 Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"
This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.
2015-11-15 21:37:13 -05:00
Dmitriy Zaporozhets aec9f211e5 Merge branch 'impersonate' into 'master'
refactor login as to be impersonation with better login/logout

Modifies the existing "login as" feature to be called impersonation.

This also adds:

* Application keep track of who is impersonating the user so they can revert back to the original user without having to log out.
* Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop.

## Screenshots:

![](http://sindacio.us/i/2015-10-28_17-52-41.png)
![](http://sindacio.us/i/2015-10-28_17-53-08.png)

See merge request !1702
2015-11-14 09:04:10 +00:00
Dmitriy Zaporozhets da8ca8b217 Merge branch 'annotate-models' into 'master'
Annotate models

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1799
2015-11-14 08:27:12 +00:00
Dmitriy Zaporozhets a237999f00 Annotate models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 19:22:46 +01:00
Kamil Trzciński eaf27c6295 Merge branch 'builds_feature' into 'master'
Expose builds feature

Expose builds feature in project settings (as feature).

Enable it by default for a new projects.

I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it.

![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png)

If we are ok, I'll add feature tests for it.

/cc @sytses @dzaporozhets 




See merge request !1767
2015-11-13 17:55:16 +00:00
Dmitriy Zaporozhets f197b528ff Merge branch 'refactor-complex-methods' into 'master'
Refactor complex methods

Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50

Part of #3444 

See merge request !1794
2015-11-13 11:48:40 +00:00
Kamil Trzcinski e53a56acea Fix broken tests 2015-11-13 10:52:50 +01:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
Dmitriy Zaporozhets 37465f44b4 Merge pull request #9825 from huacnlee/cache-application-setting
Add caching for ApplicationSetting, Ci::ApplicationSetting.
2015-11-13 10:15:52 +01:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets bcc8251196 Split complex method EventsHelper#event_feed_url.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:15:33 +01:00
Dmitriy Zaporozhets 857710634c Split complex method Issues::UpdateService#execute
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:13:45 +01:00
Dmitriy Zaporozhets 7f0b4ce16f Split complex method SystemHooksService#build_event_data
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:12:18 +01:00
Dmitriy Zaporozhets e5cc197a99 Split huge method MergeRequests::UpdateService#execute
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:06:42 +01:00
Dmitriy Zaporozhets 23ed732e39 Merge branch 'use-path-for-new-issue-button' into 'master'
Use a relative link instead of full URL with New Issue button to be consistent

Relates to #3095

See merge request !1631
2015-11-12 22:20:35 +00:00
Dmitriy Zaporozhets 329a5555e5 Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce 2015-11-12 13:25:22 +01:00
Dmitriy Zaporozhets 63144cd062 Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list
Avoid render edit_form in each notes.
2015-11-12 11:55:55 +01:00
Kamil Trzciński 8ab5df9d87 Merge branch 'ci-deprecate-dumped-yaml' into 'master'
Remove deprecated dumped yaml file generated from previous job definitions



See merge request !1777
2015-11-12 09:42:32 +00:00
Kamil Trzciński 7ec7970b14 Merge branch 'fix_project_build_links' into 'master'
Fix "Other Builds" links in Projects Build page

Found a minor issue where all links in the "Other Builds" section of Project Builds was linking to the same build #. This should fix it.

See merge request !1785
2015-11-12 09:41:54 +00:00
Jason Lee 2e4a673cbc Add caching for ApplicationSetting, Ci::ApplicationSetting.
ApplicationSetting.current was called in every pages, cache it and expires it after it updated.

This changes will avoid a SQL query in every pages (~0.3 - 0.5ms).

```SQL
SELECT  "application_settings".* FROM "application_settings"   ORDER BY "application_settings"."id" DESC LIMIT 1
```
2015-11-12 17:19:03 +08:00
Jason Lee 1974087114 Avoid render edit_form in each notes.
Use RJS to render edit note feature.

Before:

```
Rendered projects/notes/_note.html.haml (27.9ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.7ms)
Rendered projects/_md_preview.html.haml (3.9ms)
Rendered projects/notes/_edit_form.html.haml (6.9ms)
Rendered projects/notes/_note.html.haml (17.7ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.6ms)
Rendered projects/_md_preview.html.haml (3.4ms)
Rendered projects/notes/_edit_form.html.haml (7.0ms)
```

After:

```
Rendered projects/notes/_note.html.haml (13.8ms)
Rendered projects/notes/_note.html.haml (7.1ms)
Rendered projects/notes/_note.html.haml (9.5ms)
Rendered projects/notes/_note.html.haml (8.5ms)
```

This change reduce at least 6ms * N ('N' - number of notes).
2015-11-12 13:16:35 +08:00
Robert Speicher 0667f050f3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-11 11:04:03 -05:00
Yorick Peterse 7eb502c036 Change "recent" scopes to sort by "id"
These scopes can just sort by the "id" column in descending order to
achieve the same result. An added benefit is being able to perform a
backwards index scan (depending on the rest of the final query) instead
of having to actually sort data.
2015-11-11 15:17:12 +01:00
Dmitriy Zaporozhets fdad3842a6 Merge branch 'add-comment-to-one-link-in-email-to-prevent-people-adding-it-back' into 'master'
Prevent people from adding the link back.



See merge request !1938
2015-11-11 13:41:12 +00:00
Dmitriy Zaporozhets 26fab9cb95 Fix typo in email comment: hone -> one 2015-11-11 13:40:47 +00:00
Kamil Trzciński fb5c3c7021 Merge branch 'artifacts' into 'master'
Implement Build Artifacts

This implements #3028 

1. It stores artifacts in shared/artifacts,
1. It adds `artifacts` to `.gitlab-ci.yml`,
1. We use GitLab Workhorse to offload artifacts uploading,
1. To download artifacts it uses GitLab Workhorse X-Sendfile extension,
1. There's one "artifact" per-build. The new upload removes previous one and creates a new one,
1. Default max artifact size is set to 100MB - this can be changed in settings.

Missing things:
1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files,
1. Artifacts passing between builds.

GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5
GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46

Syntax:
```
artifacts:
  untracked: true # default: false
  paths: # default: empty
  - bin/files
```


See merge request !1584
2015-11-11 12:44:37 +00:00
Kamil Trzciński dfa0978906 Merge branch 'ci-build-name-in-notification-email' into 'master'
Send build name and stage in CI notification e-mail



See merge request !1776
2015-11-10 22:04:08 +00:00
Andy Brandt 73f8763e6a fix build link 2015-11-10 15:42:17 -06:00
Drew Blessing 752d528019 Fix trailing space issue with merge requests and issues. Fixes #2514 2015-11-10 15:41:49 -06:00
Stan Hu 5aa142212f Fix Drone CI service template not saving properly
Closes #3419
2015-11-10 10:52:45 -08:00
Stan Hu 9738097722 Fix avatars not showing in Atom feeds and project issues when Gravatar disabled
Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
2015-11-10 10:52:18 -08:00
Robert Speicher afcced01e5 Remove text-rendering property
Closes #3220

[ci skip]
2015-11-10 13:15:18 -05:00
Dmitriy Zaporozhets 9b5d275320 Merge branch 'improve-ci-graphs' 2015-11-10 18:52:50 +01:00
Dmitriy Zaporozhets 8ecc6f94cb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-10 18:43:33 +01:00
Dmitriy Zaporozhets 316dd9c8d6 Merge pull request #9819 from huacnlee/do-not-use-coffeescript-in-view
Replace CoffeeScript block into JavaScript in Views.
2015-11-10 18:33:11 +01:00
Dmitriy Zaporozhets 802b8fceb4 Fix graph description and text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 16:27:50 +01:00
Stan Hu 99c05363ea Remove CSS property preventing hard tabs from rendering in Chromium 45
This is to workaround a bug in Chromium 45 (https://code.google.com/p/chromium/issues/detail?id=446434),
which is the default browser in Ubuntu 14.04 and older.

Closes #3220
2015-11-10 07:19:31 -08:00
Dmitriy Zaporozhets 7181fdd23e Merge branch 'issue_3072_target_name' into 'master'
Display target branch on MR list when it is different from project's default

Fixes #3072

The screenshot below shows both previous and current UI state:

![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png)

First merge request has default branch as a target, second one has non default branch as target.

See merge request !1741
2015-11-10 12:28:45 +00:00