Robert Speicher
2be995d71c
Increase left margin for visibility descriptions
...
Now they line up with their title.
2015-05-16 16:09:32 -04:00
Robert Speicher
c7ae428b4c
Fix labels for project/snippet visibility selection
2015-05-16 16:09:04 -04:00
Dmitriy Zaporozhets
d0b1993bf8
Merge branch 'unauthorized-participants' into 'master'
...
Don't send notifications to mentioned users that don't have access to the project in question.
Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325 .
See merge request !664
2015-05-16 11:30:57 +00:00
Sytse Sijbrandij
390918b06d
Merge branch 'fix-docker-single-postgresql-startup' into 'master'
...
Set gitlab.rb in Docker single image to make PostgreSQL start up properly
See gitlab-org/omnibus-gitlab#552
See merge request !661
2015-05-15 20:11:01 +00:00
Dmitriy Zaporozhets
35729671fb
Merge branch 'attr_encryped_no_db_connection' into 'master'
...
Don't require DB connection in AttrEncrypted.
See merge request !667
2015-05-15 14:39:38 +00:00
Douwe Maan
5210778d6e
Fix specs.
2015-05-15 15:38:05 +02:00
Douwe Maan
61ceb45088
Fix.
2015-05-15 15:32:49 +02:00
Douwe Maan
ba07c9f7f5
Improve fix.
2015-05-15 14:56:04 +02:00
Douwe Maan
b77e1ae6f7
Don't require DB conncetion in AttrEncrypted.
2015-05-15 14:34:22 +02:00
Douwe Maan
6960e83b1e
Fix.
2015-05-15 13:54:41 +02:00
Jeroen van Baarsen
25b0968846
Merge pull request #9277 from jvanbaarsen/pr/9061
...
Ensure that the first added admin performs repository imports
2015-05-15 13:45:56 +02:00
Job van der Voort
940c4c101c
Merge branch '7-11-guides' into 'master'
...
Update installation/update guides for 7.11.
See merge request !665
2015-05-15 11:19:45 +00:00
Douwe Maan
fab9cbf98d
Update installation/update guides for 7.11.
2015-05-15 13:12:54 +02:00
Fotis Gimian and Jeroen van Baarsen
d74673fd43
Ensure that the first added admin performs repository imports
2015-05-15 13:01:10 +02:00
Douwe Maan
0b7c4fe048
Don't include users without project access in participants.
2015-05-15 12:46:52 +02:00
Douwe Maan
fb86ec519c
Move stuff around a bit in NotifictionService.
2015-05-15 12:45:18 +02:00
Dmitriy Zaporozhets
be969bb4de
Merge branch 'fix-653' into 'master'
...
Fix push event.
Fixes issue with !653 .
See merge request !663
2015-05-15 10:12:33 +00:00
Douwe Maan
ac3d472ff4
Fix push event.
2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets
07fd736d2e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets
9c6f4a2351
Merge branch 'dashboard-references' into 'master'
...
Fix reference links in dashboard activity and ATOM feeds.
References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.
This MR passes the project in question to the reference parsers in an option.
cc @rspeicher
See merge request !653
2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets
de1aca131e
Merge branch 'spinner-spin' into 'master'
...
Spin icon next to "Checking for CI status..."
Stationary spinners make me sad.
See merge request !655
2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets
3b4c0ea06f
Merge branch 'use-count-badges' into 'master'
...
Use count badges with number_with_delimiter helper for issue, commit count
See merge request !658
2015-05-15 09:56:56 +00:00
Jeroen van Baarsen
735fbb43ed
Merge pull request #9296 from jorgevbo/master
...
Fix bug with default timezone en RSS gitlab events
2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets
a13e6f13c7
Fix gemfile.lock
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-15 08:57:20 +03:00
Stan Hu
b43cec039c
Set gitlab.rb in Docker single image in order to make PostgreSQL start up properly
...
See gitlab-org/omnibus-gitlab#552
2015-05-15 05:25:50 +00:00
Dmitriy Zaporozhets
e54ff51aca
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-05-14 23:26:44 +03:00
Dmitriy Zaporozhets
740dc41250
Merge branch 'project_api_order' into 'master'
...
Add order option for projects API
https://dev.gitlab.org/gitlab/gitlab-ci/issues/222
See merge request !656
2015-05-14 20:25:39 +00:00
Dmitriy Zaporozhets
aa4f085184
Merge branch 'rs-refactor-2fa' into 'master'
...
Refactor SessionsController to use a controller concern
See merge request !659
2015-05-14 20:23:30 +00:00
Jorge Vasquez
dfb58234a1
Fix bug with default timezone en RSS gitlab events
2015-05-14 15:30:55 -04:00
Robert Speicher
c802d8eee1
Refactor SessionsController to use a controller concern
2015-05-14 14:24:05 -04:00
Douwe Maan
37bc4bb199
Merge branch 'fix-blob-path' into 'master'
...
Fix broken view when viewing history of a file that includes a path that used to be another file
Requires gitlab_git to v7.1.12 to be tagged and released.
Closes #1598
See merge request !651
2015-05-14 17:47:23 +00:00
Jeroen van Baarsen
e1982c3288
Merge pull request #9295 from afc163/master
...
Add style for <kbd> element in markdown
2015-05-14 19:41:43 +02:00
afc163
2738978111
Add style for <kbd> element in markdown
...
Fixes #5825
2015-05-14 23:57:01 +08:00
Dmitriy Zaporozhets
ded82ed4c9
Small refactoring of state_filters_text_for helper
2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets
40f381e652
append empty space only if count exists
2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets
3d4d89f060
Use count badges with number_with_delimiter helper for issue, commit count
2015-05-14 18:30:23 +03:00
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
Valery Sizov
7471047104
update API doc
2015-05-14 16:30:27 +03:00
Valery Sizov
7c3ca86370
Add order option for projects API
2015-05-14 15:49:09 +03: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
0b098060cc
Spin icon next to "Checking for CI status..."
2015-05-14 13:27:22 +02: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
cd52cef1c0
Fix reference links in dashboard activity and ATOM feeds.
2015-05-14 13:05:33 +02:00
Douwe Maan
74770137f6
Always show note action icons.
2015-05-14 12:18:19 +02:00
Robert Speicher
Dmitriy Zaporozhets
Sytse Sijbrandij
Douwe Maan
Jeroen van Baarsen
Job van der Voort
Fotis GimianandJeroen van Baarsen
Stan Hu
Jorge Vasquez
afc163
Dmitriy Zaporozhets
Valery Sizov
