Patricio Cano
1d3435d68f
Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee
2015-05-22 18:11:46 -05:00
Patricio Cano
91b0980a1c
Added 7.11.2 to the CHANGELOG
2015-05-22 18:07:36 -05:00
Sytse Sijbrandij
fab298d685
Fix download location
2015-05-22 21:36:00 +00:00
Sytse Sijbrandij
44506f06b0
Link to new locations.
2015-05-22 19:01:12 +00:00
Job van der Voort
18cbfd829b
Merge branch 'define_users' into 'master'
...
Added info about active users
Added a small definition for users in EE, based on Tweet
https://twitter.com/SeanSith/status/595386784760082432
See merge request !403
2015-05-22 07:22:48 +00:00
Karen Carias
51d6aa1351
Added info about active users
2015-05-21 22:48:20 +00:00
Job van der Voort
4e54a7e54f
Merge branch 'validate-user-count-before-issue-date' into 'master'
...
Validate maximum active user count up until license issue date.
Step 1 of #298
cc @sytse @job
See merge request !402
2015-05-21 18:32:26 +00:00
Douwe Maan
bf29e33d5d
Rename issued_at to starts_at.
2015-05-21 19:50:57 +02:00
Douwe Maan
fda2b5adae
Only look at year before license was issued.
2015-05-21 19:15:43 +02:00
Douwe Maan
d180f40400
Validate maximum active user count up until license issue date.
2015-05-21 18:49:24 +02:00
Job van der Voort
064170d3c1
Merge branch 'dl-info' into 'master'
...
update download info
See merge request !398
2015-05-20 12:30:10 +00:00
Job van der Voort
bb4761d826
update download info
2015-05-20 13:05:07 +02:00
Job van der Voort
4ecaf57301
Merge branch 'ce-to-ee' into 'master'
...
CE to EE
Fixes gitlab/gitlabhq#2330
See merge request !396
2015-05-15 11:36:05 +00:00
Job van der Voort
4fe6b3d7e8
Merge branch '7-11-guides' into 'master'
...
Update installation/update guides for 7.11.
See merge request !397
2015-05-15 11:20:35 +00:00
Douwe Maan
2ff2f5bf6e
Update installation/update guides for 7.11.
2015-05-15 13:13:09 +02:00
Dmitriy Zaporozhets
1af8b1e4f8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/views/help/index.html.haml
lib/gitlab/git_access.rb
public/500.html
public/502.html
2015-05-15 13:29:58 +03: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
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
Dmitriy Zaporozhets
21b10d61a1
Merge branch 'rs-ldap-2fa' into 'master'
...
Enable 2FA for LDAP logins
See merge request !395
2015-05-14 20:22:20 +00:00
Jorge Vasquez
dfb58234a1
Fix bug with default timezone en RSS gitlab events
2015-05-14 15:30:55 -04:00
Robert Speicher
0ad9fc60ec
Enable 2FA for LDAP logins
2015-05-14 14:45:31 -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
Patricio Cano
Sytse Sijbrandij
Job van der Voort
Karen Carias
Douwe Maan
Job van der Voort
Dmitriy Zaporozhets
Jeroen van Baarsen
Dmitriy Zaporozhets
Jorge Vasquez
Robert Speicher
afc163
Valery Sizov
