Valery Sizov
b7431ec042
Make all group public
2015-09-09 11:27:03 +03:00
Dmitriy Zaporozhets
e0da2c3523
Merge branch 'ui-improvements' into 'master'
...
Ui improvements
* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages
See merge request !1255
2015-09-07 14:17:00 +00:00
Dmitriy Zaporozhets
2b31989582
Fix compare tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-07 14:55:42 +02:00
Valery Sizov
954dd7ce87
Merge branch 'crowd' into 'master'
...
Crowd integration
https://dev.gitlab.org/gitlab/gitlabhq/issues/2217
See merge request !1228
2015-09-07 11:20:03 +00:00
Dmitriy Zaporozhets
183562bc35
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-07 12:45:06 +02:00
Valery Sizov
9836017c70
satisfy rubocop
2015-09-07 13:15:27 +03:00
Douwe Maan
662cf2cef4
Merge branch 'fix-wiki-page-history' into 'master'
...
Fix broken Wiki Page History
This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
See merge request !1232
2015-09-07 09:27:48 +00:00
Dmitriy Zaporozhets
aa75e76a0a
Fix this crazy random failing test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-04 15:36:25 +02:00
Dmitriy Zaporozhets
8b5a14fd0a
Fix failing test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-04 14:53:25 +02:00
Dmitriy Zaporozhets
858675ff8a
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-03 22:25:52 +02:00
Dmitriy Zaporozhets
c2a9e6ea67
Fix tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-03 22:15:21 +02:00
Dmitriy Zaporozhets
774c523c1f
Fix tests and update CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-02 20:02:26 +02:00
Valery Sizov
81fe6f9d7e
added spinach
2015-09-02 16:17:30 +03:00
Stan Hu
fbb891c8f3
Fix broken Wiki Page History
...
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01 23:29:27 -07:00
Valery Sizov
ff30b40754
Make all profile public
2015-08-27 13:06:14 +03:00
Dmitriy Zaporozhets
ef0149dd44
Merge branch 'enable_ssl_verification_web_hook' into 'master'
...
Enable SSL verification for Webhooks
https://dev.gitlab.org/gitlab/gitlabhq/issues/2121
See merge request !1135
2015-08-26 16:06:02 +00:00
Valery Sizov
bafffb2d14
Enable SSL verification for Webhooks
2015-08-26 15:48:31 +03:00
Dmitriy Zaporozhets
a0284b5b85
Merge branch 'separate-activity' into 'master'
...
Separate activity page
Move activity to separate page.
Part of #2225
See merge request !1198
2015-08-25 16:19:12 +00:00
Dmitriy Zaporozhets
7569010bc3
Fix tests and last push widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-25 16:36:54 +02:00
Dmitriy Zaporozhets
429c0d1491
Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'
...
Fix "Reload with full diff" URL button in compare branch view
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
See merge request !1195
2015-08-25 14:13:05 +00:00
Stan Hu
3bee4a6712
Fix "Reload with full diff" URL button in compare branch view
...
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
2015-08-24 23:35:26 -07:00
Valery Sizov
56527b63e8
Ability to search milestones
2015-08-24 13:59:01 +03:00
Douwe Maan
0daa21ed8c
Merge branch 'fix-email-autocomplete' into 'master'
...
Fix bug preventing invite by e-mail
This was broken in 70f5291808Closes #2320
See merge request !1181
2015-08-21 22:25:59 +00:00
Stan Hu
3715a0f29b
Fix bug preventing invite by e-mail
...
This was broken in 70f5291808Closes #2320
2015-08-21 13:47:56 -07:00
Dmitriy Zaporozhets
8819007c83
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-20 14:19:32 +02:00
Dmitriy Zaporozhets
e06e9623fd
Fix test
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-20 12:32:44 +02:00
Artem Sidorenko
e238a8dad5
Import sources: show only enabled sources
2015-08-20 12:13:22 +02:00
Artem Sidorenko
0719022739
Spinach tests
2015-08-19 13:47:03 +02:00
Dmitriy Zaporozhets
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-19 09:52:39 +02:00
Ben Bodenmiller
692e381e0c
capitalize URL in "Home page URL"
2015-08-17 23:16:18 -07:00
Dmitriy Zaporozhets
9649f9387a
Fix tests for web editor
2015-08-14 15:08:31 +02:00
Dmitriy Zaporozhets
69c193e78a
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-11 22:48:55 +02:00
Dmitriy Zaporozhets
cb6ad67f52
Merge branch 'check-out-branch-button' into 'master'
...
Add "Check out branch" button to the MR page.
I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well.
Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120 .
It looks even better in combination with !1121 , which gets rid of the "If you want to ..." line:
cc @dzaporozhets @rspeicher
See merge request !1116
2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5admitriy.zaporozhets@gmail.com >
2015-08-11 10:28:42 +02:00
Douwe Maan
4a2b7cef57
Merge branch 'master' into check-out-branch-button
2015-08-10 14:16:40 +02:00
Douwe Maan
b716e45de1
Fix spec
2015-08-10 14:15:27 +02:00
Stan Hu
1a3283d4e8
Merge branch 'gravatar-host-link' into 'master'
...
link to configured gravatar host on profile page
This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service.
See merge request !1093
2015-08-09 22:42:07 +00:00
Robert Speicher
fb6dc1f07d
Add Group#add_* convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets
c5eb2977d7
Merge branch 'add-current-user-to-autocomplete' into 'master'
...
Always add current user to autocomplete controller to support filter by "Me"
### What does this MR do?
This MR always adds the current user to the autocomplete list of users.
### Why was this MR needed?
Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.
### What are the relevant issue numbers?
Partial fix #2202
See merge request !1100
2015-08-06 16:10:38 +00:00
Dmitriy Zaporozhets
485b9efe9f
Remove trailing lines
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-06 17:27:48 +02:00
Dmitriy Zaporozhets
02c4a0cc73
Add tests for abuse report feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-06 16:57:04 +02:00
Stan Hu
70f5291808
Always add current user to autocomplete controller to support filter by "Me"
...
Partial fix #2202
2015-08-06 00:46:14 -07:00
Ben Bodenmiller
0f785bbc7e
ink to configured gravatar host on profile page
2015-08-05 00:48:16 -07:00
Dmitriy Zaporozhets
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-04 16:42:36 +02:00
Stan Hu
369275d630
Fix network graph when branch name has single quotes
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
2015-07-29 23:29:47 -07:00
Stan Hu
562242cb9d
Fix commit data retrieval when branch name has single quotes
...
Closes #1724
2015-07-26 03:47:01 -07:00
Douwe Maan
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
Stan Hu
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets
fa88f2c084
Use real branches from test repo
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-16 17:09:20 +02:00
Valery Sizov
Dmitriy Zaporozhets
Valery Sizov
Douwe Maan
Stan Hu
Artem Sidorenko
Ben Bodenmiller
Robert Speicher
