Dmitriy Zaporozhets
8dde52cc09
Merge branch 'fewer-icons' into 'master'
...
Use slightly fewer icons in project sidebar.
See merge request !657
2015-05-14 15:03:07 +00:00
Douwe Maan
191bb46d74
Use slightly fewer icons in project sidebar.
2015-05-14 17:02:00 +02:00
Dmitriy Zaporozhets
947231a461
Merge branch 'rs-relative-link-filter' into 'master'
...
Minor RelativeLinkFilter cleanup
See merge request !649
2015-05-14 14:37:43 +00:00
Dmitriy Zaporozhets
19251a1fc7
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 17:22:55 +03:00
Dmitriy Zaporozhets
c2ee828c19
Merge branch 'omniauth-csrf' into 'master'
...
Protect OmniAuth request phase against CSRF.
Addresses #2268 .
See merge request !1793
2015-05-14 14:22:26 +00:00
Dmitriy Zaporozhets
434180c7d2
Merge branch 'fix-group-mention' into 'master'
...
Fix mentioning of private groups.
`issue.participants` would mistakenly not send the `current_user` to `mentioned_users`, which means it would search for referenced groups and users as if the user was signed out. Since signed out users don't have access to private groups (groups without public projects) and since you can't reference a group you don't have access to (since this would leak its existence), the group reference wasn't found and the group members weren't notified.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2326 .
See merge request !654
2015-05-14 14:10:00 +00:00
Dmitriy Zaporozhets
5619c7b968
Merge branch 'note-action-icons' into 'master'
...
Always show note action icons.
As discussed in #639 .
The delete icon becomes red on hover, the edit one becomes slightly darker.
The "Link here" icon has been removed, and the link to the specific comment can now be found by clicking the post date ("3 months ago"), which is most other sites do it as well.
See merge request !652
2015-05-14 12:43:39 +00:00
Douwe Maan
e7eee3b720
Add changelog item.
2015-05-14 13:19:25 +02:00
Douwe Maan
77dc71d550
Fix mentioning of private groups.
2015-05-14 13:15:13 +02:00
Douwe Maan
74770137f6
Always show note action icons.
2015-05-14 12:18:19 +02:00
Sytse Sijbrandij
910794bae5
Merge branch 'upgrade-dockerfile-apt' into 'master'
...
Use apt repositories to upgrade Docker images to the latest versions
Reduces the need to bump versions periodically.
See merge request !647
2015-05-14 07:52:54 +00:00
Marin Jankovski
fbc6ea5437
GitLab shell version to 2.6.3.
2015-05-14 09:35:34 +02:00
Marin Jankovski
7b90f2c6e9
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 09:35:06 +02:00
Stan Hu
cfe6013b96
Use apt repositories to upgrade Docker builds to the latest GitLab version
...
Reduces the need to bump versions periodically.
2015-05-13 20:31:23 +00:00
Robert Speicher
7f2fb72a0a
Minor RelativeLinkFilter cleanup
2015-05-13 14:08:37 -04:00
Dmitriy Zaporozhets
66209a3aac
Merge branch 'sidekiq-sigkill' into 'master'
...
Use SIGKILL by default in Sidekiq::MemoryKiller
This makes the memory growth-triggered Sidekiq restarts more reliable by
reducing the chance that Sidekiq ends up in a state where it is not
accepting new jobs but also not shutting down: SIGKILL is more likely to
work than SIGTERM.
See merge request !1824
2015-05-13 17:48:36 +00:00
Jacob Vosmaer
c291ff9c6f
Use SIGKILL by default in Sidekiq::MemoryKiller
...
This makes the memory growth-triggered Sidekiq restarts more reliable by
reducing the chance that Sidekiq ends up in a state where it is not
accepting new jobs but also not shutting down: SIGKILL is more likely to
work than SIGTERM.
2015-05-13 17:09:12 +02:00
Sytse Sijbrandij
cc0a4b7ee8
Merge requests are welcome in spite of the deprecation.
2015-05-13 12:16:05 +00:00
Dmitriy Zaporozhets
091c906131
Fix text overflow in project sidebar
2015-05-13 15:14:02 +03:00
Dmitriy Zaporozhets
8ad91d5840
Merge branch 'text-batch-1' into 'master'
...
Batch 1 of text improvements
Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.
This batch includes:
- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.
cc @rspeicher
See merge request !642
2015-05-13 12:05:17 +00:00
Dmitriy Zaporozhets
5dcbe6f4ba
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-13 14:27:02 +03:00
Dmitriy Zaporozhets
63403019d2
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-13 14:26:39 +03:00
Dmitriy Zaporozhets
f32a045ef4
Merge branch 'version-check' into 'master'
...
Version check
See merge request !1509
2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets
740716afd1
Merge pull request #9276 from jirutka/relative_link_filter
...
Extract handling of relative file links to its own HTML filter
2015-05-13 14:09:57 +03:00
Sytse Sijbrandij
82dec4b49b
remove strange code branchets
2015-05-13 10:08:48 +00:00
Sytse Sijbrandij
cfef2a11d9
Deprecate the upgrader script since we forget to update it.
2015-05-13 10:08:04 +00:00
Jeroen van Baarsen
892158f136
Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit
...
Call merge request web hook for each commits
2015-05-13 11:57:33 +02:00
Dmitriy Zaporozhets
cb8f974b21
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2015-05-13 12:40:09 +03:00
Marin Jankovski
700e5117cd
Merge branch 'code-defreeze' into 'master'
...
defreeze code
Fixes #2166 .
See merge request !1820
2015-05-13 09:10:47 +00:00
Marin Jankovski
3883cca93f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-13 11:10:18 +02:00
Douwe Maan
c5e4b443ff
Fix GitAccess.
2015-05-13 09:46:22 +02:00
Douwe Maan
1981174a1e
Fix 422 error page.
2015-05-13 09:41:56 +02:00
Douwe Maan
0c4653e101
Improve OAuth application flash messages.
2015-05-13 09:41:56 +02:00
Douwe Maan
17a41547a0
Improve OAuth signup error message.
2015-05-13 09:41:56 +02:00
Douwe Maan
9eb45ccd55
Improve description of branch protection levels.
2015-05-13 09:41:55 +02:00
Douwe Maan
1f72c387c9
Improve Git access error messages.
2015-05-13 09:41:55 +02:00
Douwe Maan
bd8ff93c8c
Improve text on error pages.
2015-05-13 09:41:55 +02:00
Arthur Gautier
a927bf56b1
Call merge request web hook for each commits
...
Call merge request web hook every times a new commit hits the
source branch
Signed-off-by: Arthur Gautier <baloo@gandi.net >
2015-05-13 09:33:20 +02:00
Dmitriy Zaporozhets
b92d608350
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-12 19:06:25 +03:00
Sytse Sijbrandij
21d65470b4
Merge branch 'remove-outdated-gif' into 'master'
...
Replace outdated gif in README with link to website
Fixes #2298
See merge request !1806
2015-05-12 14:58:31 +00:00
Hannes Rosenögger
1dd0caf4d9
Merge branch 'fix-avatar-removal' into 'master'
...
Fix bug where avatar filenames were not actually deleted from the database during removal
This would result in a 404 error in certain views.
The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.
Closes #1570
See merge request !620
2015-05-12 14:46:58 +00:00
Dmitriy Zaporozhets
8b9e3af8bf
Merge branch 'ad-block_auto_created_users' into 'master'
...
Don't accidentally unblock auto created users from Active Directory.
Fixes #1581 .
See merge request !638
2015-05-12 13:28:33 +00:00
Dmitriy Zaporozhets
0bac9d0135
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-12 16:26:21 +03:00
Douwe Maan
1f080825ef
Merge branch 'remove-mysql-index-conversion-from-docs' into 'master'
...
Update docs in line with mysql-postgresql-converter changes.
See merge request !640
2015-05-12 13:14:06 +00:00
Sytse Sijbrandij
bebeed5b77
Merge branch 'migration_style_guide' into 'master'
...
Update migration style guide
See merge request !1823
2015-05-12 12:42:26 +00:00
Douwe Maan
8acd705c8a
Update docs in line with mysql-postgresql-converter changes.
2015-05-12 13:36:20 +02:00
Valery Sizov
34a9aa2e8a
update migration style guide
2015-05-12 14:34:43 +03:00
Dmitriy Zaporozhets
b0b25e37c9
Merge branch 'note-role' into 'master'
...
Show user roles by comments.
I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.
On hover, the note actions replace the role:
---
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321 .
cc @sytses
See merge request !639
2015-05-12 11:28:39 +00:00
Dmitriy Zaporozhets
474023b71a
Fix Gemfile.lock
2015-05-12 14:26:46 +03:00
Dmitriy Zaporozhets
1a1e42ad31
Merge branch 'rs-system-note' into 'master'
...
Add SystemNoteService class
The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.
See merge request !595
2015-05-12 10:45:42 +00:00
Dmitriy Zaporozhets
Douwe Maan
Dmitriy Zaporozhets
Sytse Sijbrandij
Marin Jankovski
Stan Hu
Robert Speicher
Jacob Vosmaer
Jeroen van Baarsen
Marin Jankovski
Arthur Gautier
Hannes Rosenögger
Valery Sizov
