home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,137 Commits 48 Branches 340 Tags
eb2ce79d2e1d0e4e16052d630468925a6c87f725
Commit Graph
7442 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3a602c8432 Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors 
Complete transition to using color_field for selecting colors
 2015-03-24 15:27:58 -07:00
Dmitriy Zaporozhets 533b5721c6 Merge branch 'unset-assignee' into 'master' 
Make sure issue assignee is properly reset.

Previously, when the assignee was reset via the sidebar or bulk edit, `assignee_id` was set to `-1` rather than `null`, which caused the two issues shown below:

![Screen_Shot_2015-03-24_at_16.52.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3c937795c45031c3c72c124ced866598/Screen_Shot_2015-03-24_at_16.52.13.png)

- A "(deleted)" participant
- An empty selectbox in the sidebar, instead of "Select assignee"

See merge request !443
 2015-03-24 21:10:18 +00:00
Dmitriy Zaporozhets b8ad3647ad Merge branch 'fix-nested-tasks' into 'master' 
Fix nested task lists

When nesting task list items, the parent item is wrapped in a `<p>` tag.  Update the task list parser to handle these paragraph wrappers.

cc @sytse

See merge request !413
 2015-03-24 20:57:35 +00:00
Andrew Tomaka 83b5a9ae2b Update help texts and default value setting 2015-03-24 12:27:26 -04:00
Douwe Maan 515e9d51df Make sure issue assignee is properly reset. 2015-03-24 16:52:02 +01:00
Dmitriy Zaporozhets c3c9703437 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 17:11:58 -07:00
Dmitriy Zaporozhets 88a15b4e78 Merge branch 'merge-status-without-timestamps' into 'master' 
Don't mark merge request as updated when merge status relative to target branch changes.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165.

See merge request !431
 2015-03-24 00:11:19 +00:00
Dmitriy Zaporozhets 27809a8059 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 17:10:56 -07:00
Dmitriy Zaporozhets 2bb4ea8542 Merge branch 'notes-count-without-system' into 'master' 
Don't include system notes in issue/MR comment count.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163.

See merge request !430
 2015-03-24 00:10:25 +00:00
Dmitriy Zaporozhets 2cd6cc7fed Merge branch 'improve-diff-header' into 'master' 
Fix file mode going to next line in diff header

See merge request !432
 2015-03-24 00:09:40 +00:00
Andrew Tomaka 4349e524f4 Update broadcast messages to use color_field 2015-03-23 17:22:50 -04:00
Douwe Maan f039e8e03f Don't use required keyword arguments to maintain support for Ruby 2.0. 2015-03-23 21:20:48 +01:00
hebbet 97dd1046e7 Change comment in blue ui to match other scss 
Change comment in blue ui to match other scss files
 2015-03-23 20:07:13 +01:00
Dmitriy Zaporozhets 2953e0d19b Merge branch 'emailsonpush-create-delete' into 'master' 
Send EmailsOnPush email when branch or tag is created or deleted.

Addresses #1951, #1957 and #1925.

![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png)

![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png)

![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png)

![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png)

See merge request !1709
 2015-03-23 16:48:27 +00:00
Dmitriy Zaporozhets 54326f490e Merge branch 'no-comment-bubble' into 'master' 
Don't show commit comment button when user is not signed in.

Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167.

See merge request !429
 2015-03-23 16:47:16 +00:00
Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll' 
Conflicts:
	app/controllers/users_controller.rb
 2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets 81d603e2c1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 09:44:28 -07:00
Dmitriy Zaporozhets 78fe7270ab Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-23 09:44:20 -07:00
Dmitriy Zaporozhets e24da35984 Merge branch 'improve-contributions-calendar' into 'master' 
Replace commits calendar with contributions calendar

* count opening of issues and merge requests
* dont trigger git repository - use events from database
* count pushes instead of commits for faster and easier counting
* much-much faster since does not affected by repository size

See merge request !420
 2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets 61700f619c Fix file mode going to next line in diff header 2015-03-23 09:38:52 -07:00
Douwe Maan 70fa9d5629 Don't mark merge request as updated when merge status relative to target branch changes. 2015-03-23 17:30:19 +01:00
Dmitriy Zaporozhets 66e3999287 Merge branch 'your' into 'master' 
Update views to single form of address. Change "my" to "your"

Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password".

cc @sytse @job

See merge request !1736
 2015-03-23 16:12:51 +00:00
vichak e5b8cf0a8f Fix #8966 Remove Milestones/Labels from project navbar when Isses disabled 2015-03-23 16:48:50 +01:00
Douwe Maan 6b92236eeb Don't include system notes in issue/MR comment count. 2015-03-23 16:43:08 +01:00
Douwe Maan a30645c68f Don't show commit comment button when user is not signed in. 2015-03-23 16:17:10 +01:00
Douwe Maan 3ca34bb8f0 Merge branch 'fix-admin-service-template-config' into 'master' 
Include missing events and fix save functionality in admin service template settings form

### What does this MR do?

This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings.

### Are there points in the code the reviewer needs to double check?

No.

### Why was this MR needed?

Because the service template form was broken and untested.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1275

Before:

![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png)

After:

![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png)

See merge request !427
 2015-03-23 14:58:15 +00:00
Douwe Maan b13bed62ea Clean up code by using keyword arguments. 2015-03-23 15:08:19 +01:00
Stan Hu a3daead1b0 Include missing events and fix save functionality in admin service template settings form 
Closes #1275
 2015-03-23 05:51:38 -07:00
vichak a793c06532 Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabled 2015-03-23 10:38:33 +01:00
Dmitriy Zaporozhets bc4e251898 Make panel heading font bold 2015-03-22 20:16:25 -07:00
Dmitriy Zaporozhets 9e554a5223 Update views to single form of address. Change "my" to "your" 2015-03-22 20:10:12 -07:00
Dmitriy Zaporozhets fee1f2e0ab Fix atom feed for user page 2015-03-22 19:41:12 -07:00
Dmitriy Zaporozhets 1d85e5ffff Merge branch 'fix-dots-in-wiki-title' into 'master' 
Fix dots in Wiki slug causing errors

### What does this MR do?

When a user enters in dots into the Wiki slug, an error occurs:

```
NoMethodError (undefined method `escaped_url_path' for nil:NilClass):
  app/models/wiki_page.rb:172:in `set_attributes'
  app/models/wiki_page.rb:191:in `save'
  app/models/wiki_page.rb:155:in `update'
  app/controllers/projects/wikis_controller.rb:49:in `update'
```

This MR fixes this problem.

### Are there points in the code the reviewer needs to double check?

See the problem below.

### Why was this MR needed?

The issue is that the `save` method gets called differently:

```ruby
def create(attr = {})
....
    save :create_page, title, content, format, message
```

or

```ruby
def update(new_content = "", format = :markdown, message = nil)
...
    save :update_page, @page, content, format, message
```

In the create case, title is the slug entered in by the user (e.g. `path/how-to-write-wiki-pages`).

In the update case, originally `@page.page` included the format extension (e.g.`path/how-to-write-wiki-pages.Markdown`). The method `page_title_and_dir` was trying to handle both cases and not doing the right thing. For example, calling `page_title_and_dir('test-1.2.3')` would result in:

```
path_title = test-1.2
path_dir = 3
```

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Issues #1263, #431

This replaces !156

See merge request !419
 2015-03-22 23:32:00 +00:00
Dmitriy Zaporozhets 9968250211 Add inifinite scroll to user activity on user page 2015-03-22 15:40:26 -07:00
Dmitriy Zaporozhets 3743214729 Merge branch 'fix-import-from-modal' into 'master' 
Fix "Import projects from" button to show the correct instructions

Closes #1267

See merge request !422
 2015-03-22 22:20:20 +00:00
Dmitriy Zaporozhets 8494170550 Improve contribution calendar per day info 2015-03-22 14:52:44 -07:00
Dmitriy Zaporozhets 54aca18cf8 Contribution calendar will use events instead of commits to count contributions 2015-03-22 14:35:27 -07:00
Dmitriy Zaporozhets 43afe46bbd Refactor contributions events and write tests for calendar 2015-03-22 13:55:00 -07:00
Stan Hu 90cbb73ed6 Fix "Import projects from" button to show the correct instructions 
Closes #1267
 2015-03-22 08:47:22 -07:00
Robert Schilling 38ba8b45ad Remove old GitLab auth image 2015-03-22 09:05:13 +01:00
Dmitriy Zaporozhets 64891c6c40 Replace commits calendar with contributions calendar 
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* much-much faster since does not affected by repository size
 2015-03-21 23:48:08 -07:00
Stan Hu 59d5c77975 Fix dots in Wiki slug causing errors 
Closes #1263, #431
 2015-03-21 18:33:51 -07:00
Dmitriy Zaporozhets 777c119fd2 Restyle oauth accounts at profile page and add ability to unlink account 2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets 9f1c284408 Remove 32px oauth images 2015-03-21 17:41:58 -07:00
Dmitriy Zaporozhets fad1c2e7c3 Merge branch 'topic/push_tag_events_for_ci' of https://github.com/ayufan/gitlabhq into ayufan-topic/push_tag_events_for_ci 2015-03-21 15:25:54 -07:00
Dmitriy Zaporozhets 63da396f59 Merge branch 'performance-tune' into 'master' 
Performance improvements

* Cache project branches and tags into variables
* Cache lookup results into hash to prevent repeating same requests to git repo
* Cache head commit and head tree

See merge request !417
 2015-03-21 21:11:14 +00:00
Dmitriy Zaporozhets d96098e966 Cache head commit and head tree 2015-03-21 13:45:08 -07:00
Dmitriy Zaporozhets c378d20c84 Cache lookup results into hash to prevent repeating same requests to git repo 2015-03-21 13:44:51 -07:00
Dmitriy Zaporozhets 2c796a1785 Cache project branches and tags into variables 2015-03-21 13:44:11 -07:00
Dmitriy Zaporozhets b624b775aa Hide UI elements when print md files or wiki pages 2015-03-21 12:13:47 -07:00