Commit Graph
15110 Commits
Author SHA1 Message Date
Douwe Maan 2d5f4458a0 Fix admin user projects lists. 2015-03-31 09:19:08 +02: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
Douwe Maan ceaa2f5c26 Merge pull request #9001 from vichak/master
Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
2015-03-23 17:37:17 +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 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
Robert Schilling 005f7eb41f Merge branch 'upgrade-dockerfile-7.9.0' into 'master'
Bump Docker build to GitLab v7.9.0

See merge request !426
2015-03-23 12:40:25 +00:00
Stan Hu a2e161cb35 Bump Docker build to GitLab v7.9.0 2015-03-23 12:11:38 +00:00
vichak a793c06532 Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabled 2015-03-23 10:38:33 +01:00
Douwe Maan d4d0852d2d Merge pull request #8995 from MichaelAlt/patch-1
Faulty LDAP DN name escaping removed
2015-03-23 08:23:19 +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 b449bc5b77 Improve user calendar test 2015-03-22 19:47:23 -07:00
Dmitriy Zaporozhets fee1f2e0ab Fix atom feed for user page 2015-03-22 19:41:12 -07:00
Dmitriy Zaporozhets b3c6f0b297 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-22 19:38:09 -07:00
Dmitriy Zaporozhets e9b0058836 Merge branch 'fix-broken-new-project-import' into 'master'
Fix OAuth2 issue importing a new project from GitHub and GitLab

It appears that the GitLab OAuth2 client options were converted to strings instead of symbols when merged with the default options (i.e. `{}.merge(github_options)`). As a result, the OAuth2 defaults were being used. For example, the OAuth2 client options would have a key with `authorize_url` and `:authorize_url`, but the former was never used. As a result, the OAuth2 client would always use the wrong URL to talk to GitHub.

Note that this bug should also have affected GitLab, but not Bitbucket: The OAuth client is careful to convert all keys to symbols.

Closes #1268

See merge request !425
2015-03-23 02:33:45 +00:00
Stan Hu 5cce0645b0 Fix OAuth2 issue importing a new project from GitHub and GitLab
Closes #1268
2015-03-22 18:16:48 -07:00
Dmitriy Zaporozhets fb30039668 Merge branch 'disable-ref-generation-in-code-blocks' into 'master'
Disable reference generation in preformatted/code blocks

### Summary

If a user adds text in code or preformatted text via Markdown or HTML that contains `#XXX`, the system adds a note that issue `XXX` was mentioned. This is particularly annoying because we often list gdb backtrace dumps into our issues, and many issues get mentioned as a result. For example:

```
(gdb) bt
#0  0x00000000004004c4 in second () at main.cc:6
#1  0x00000000004004d2 in first () at main.cc:11
#2  0x00000000004004dd in main () at main.cc:17
(gdb)
```

### Steps to reproduce

1. In an issue, write the above text using Markdown or HTML tags (e.g. `<code>`, `<pre>`).
2. Observe that [issue 1](https://gitlab.com/gitlab-org/gitlab-ce/issues/1) and [issue 2](https://gitlab.com/gitlab-org/gitlab-ce/issues/2) have a note that says they were mentioned.

### Expected behavior

Everything enclosed in the code blocks should be ignored as references.

### Observed behavior

Issues get referenced unnecessarily.

### Fix

I've made `reference_extractor.rb` strip out HTML and Markdown blocks before processing. I considered running the raw text through the entire Markdown processor, but this seems overkill and perhaps could lead to some unintended side effects.

See merge request !365
2015-03-22 23:36:07 +00: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 7510536643 Merge branch 'master' into 'master'
Updated upgrader.md to highlight nodejs as required package [ci skip]

Updated upgrader.md to highlight nodejs pacakage so this is kept consistent with the other packages listed as required/changed.

This is purely a documentation change.

See merge request !424
2015-03-22 23:30:46 +00:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +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 7d84252e05 Update CHANGELOG with contribution calendar 2015-03-22 14:37:14 -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
Robert Schilling d5bb86b011 Merge pull request #8997 from kahwee/patch-1
Remove the "unreleased" word from v7.9.0 changelog
2015-03-22 21:22:48 +01:00
KahWee Teng 497fd75dbd Remove the "unreleased" word from v7.9.0 changelog 2015-03-23 03:09:23 +08:00
Dmitriy Zaporozhets 20a12438ab Fix user controller specs 2015-03-22 11:14:42 -07:00
Dmitriy Zaporozhets 9c6086bc95 Refactor repository specs 2015-03-22 11:01:45 -07:00
Dmitriy Zaporozhets 993774797c Merge branch 'remove_old_auth_image' into 'master'
Remove old GitLab auth image

Remove `gitlab_64.png_old` because it seems to to be an artifact.

Related to !419

See merge request !421
2015-03-22 17:54:00 +00: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
Dmitriy Zaporozhets 29f6b01d63 Merge branch 'improve-profile' into 'master'
Improve profile

### OLD

![old-oauth](https://gitlab.com/gitlab-org/gitlab-ce/uploads/86f4b19d4e4cc9cf2705400428541a82/old-oauth.png)

### NEW

![profile](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c480372e66af579ce355d5c215669296/profile.png)

See merge request !418
2015-03-22 03:33:29 +00: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 aadd38dbb9 Merge branch 'backup-permissions' into 'master'
Change permissions on backup files - #2

Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.  See #1894.  Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600.

This is a followup to !1703, which was reverted because it broke Rspec tests.  The test failures were due to the rake task changing directories and not changing back, which I fixed with this commit.

cc @sytse

See merge request !1716
2015-03-21 23:50:20 +00:00
Dmitriy Zaporozhets 33a9f40059 Merge branch 'add-sidetiq' into 'master'
Add sidetiq dependency

Add the sidetiq gem to the Gemfile to match EE.  See #2159.

cc @sytse

See merge request !1734
2015-03-21 23:38:10 +00: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