Commit Graph
15999 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ac5f9ff408 Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded 2015-04-30 19:34:07 +03:00
Dmitriy Zaporozhets 8d3eaf5fa1 Merge branch 'fix_data' into 'master'
Remove abandoned GroupMembers

https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457

See merge request !1802
2015-04-29 11:27:42 +00:00
Valery Sizov 4d3a93af2d Remove abandoned GroupMembers 2015-04-29 13:46:57 +03:00
Sullivan SENECHAL 2b0a1ca013 Fix .container position on navbar (reloaded) 2015-04-29 12:42:39 +02:00
Dmitriy Zaporozhets 18a9151bf6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-29 12:26:44 +03:00
Dmitriy Zaporozhets 332a17cf42 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-04-29 12:25:46 +03:00
Dmitriy Zaporozhets acad85459f Revert "Fix '.container or .container-fluid should be the first child inside of a .navbar' issue"
This reverts commit 570594a469.
2015-04-29 12:24:54 +03:00
Jeroen van Baarsen ac8f1ba876 Merge pull request #9220 from kylekatarnls/patch-1
Fix #9219 Affix menu size change
2015-04-29 10:45:05 +02:00
Kyle 981c3c303f Fix #9219 Affix menu size change 2015-04-29 00:06:48 +02:00
Jeroen van Baarsen 285cf3f772 Merge pull request #8677 from jubianchi/api-500-json
Send 500 errors as JSON in the API
2015-04-28 18:03:34 +02:00
Douwe Maan 822ba95f75 Merge branch 'fix-commit-data-url-generation' into 'master'
Fix bug where commit data would not appear in some subdirectories

Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example:

https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix)

The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior.

* Closes #1478, #1459
* Closes https://github.com/gitlabhq/gitlabhq/issues/9037

See merge request !581
2015-04-28 15:46:36 +00:00
Dmitriy Zaporozhets 8140c68289 Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797
2015-04-28 08:34:34 +00:00
Dmitriy Zaporozhets f0227d761f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-28 11:32:37 +03:00
Dmitriy Zaporozhets 2940de43a5 Merge branch 'admin-add-group-members' into 'master'
Fix adding new group members from admin area

Fix for #2222

Tests for this case already exists but it was green.
It related to current way dealing with ajax selectbox.
Improving tests might be a reason for another merge requests - everyone is welcome to participate.

See merge request !1796
2015-04-28 08:31:48 +00:00
Jeroen van Baarsen f93616d62b Merge pull request #8680 from jubianchi/dev-rerun-foreman
Add a rake task to automatically restart foreman when changes occur
2015-04-28 09:41:28 +02:00
Sytse Sijbrandij c505eda3e8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 23:10:10 -07:00
Sytse Sijbrandij d7062d5ef6 Merge branch 'docker-improvements' into 'master'
Add more instructions on how to publish docker images yourself.

See merge request !1800
2015-04-28 06:09:47 +00:00
Sytse Sijbrandij f476888e77 Add more instuctions on how to publish docker images yourself. 2015-04-27 23:09:03 -07:00
Robert Speicher e3d2304d69 Specs don't need to set default_url_options anymore 2015-04-27 15:47:05 -04:00
jubianchi 3070b2cfc7 Add a rake task to automatically restart foreman when changes occur 2015-04-27 21:32:41 +02:00
jubianchi 79d0b69345 Send 500 errors as JSON in the API 2015-04-27 21:27:02 +02:00
Jeroen van Baarsen fbb5a359fe Merge pull request #8754 from jirutka/fix-project_name_regex
Fix (project_)name_regex to accept non-ASCII letters and dash
2015-04-27 17:48:14 +02:00
Dmitriy Zaporozhets f21e269668 Fix adding new group members from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-27 18:05:51 +03:00
Jakub Jirutka a1c01bc19b Fix (project_)name_regex to accept non-ASCII letters and dash 2015-04-27 16:38:47 +02:00
Dmitriy Zaporozhets 9f443f4257 Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'
Fix broken file browsing with relative submodule in personal projects

Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.

To reproduce the problem, go here:

https://gitlab.com/andrewwu.tw/submodule-test/tree/master

Closes https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !565
2015-04-27 14:23:01 +00:00
Dmitriy Zaporozhets c1a5f4710a Merge pull request #8645 from chulkilee/hipchat-api-version
Add api version property on hipchat service
2015-04-27 17:07:54 +03:00
Robert Schilling bd606e3b62 Merge branch 'upgrade-dockerfile-7.10.0' into 'master'
Upgrade Docker build to v7.10.0

See merge request !568
2015-04-27 13:32:05 +00:00
Valery Sizov bc9ba5237c Revert "Added X-GitLab-Event header for web hooks"
This reverts commit 548f182814.
2015-04-27 16:29:31 +03:00
Stan Hu f50103ad7e Upgrade Docker build to v7.10.0 2015-04-27 13:24:24 +00:00
Chulki Lee 57c724558d Add api version property on hipchat service 2015-04-27 21:14:04 +09:00
Jeroen van Baarsen bb8c1cadf3 Merge pull request #9209 from Soullivaneuh/bootstrap-update
Bootstrap 3.3.4
2015-04-27 13:19:35 +02:00
Jeroen van Baarsen 5b69b2686f Merge pull request #9208 from Soullivaneuh/container-class
Fix .container position on navbar
2015-04-27 13:19:16 +02:00
Jeroen van Baarsen 365360098f Merge pull request #9207 from Soullivaneuh/x-ua-compatible
Fix missing X-UA-Compatible meta tag
2015-04-27 13:18:35 +02:00
Dmitriy Zaporozhets 278c3ba401 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets 2cbdfbfd1e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets 38e2ae5ae0 Merge pull request #8644 from Bugagazavr/hook-events
Add X-GitLab-Event header for web hooks
2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets 7ee1d68e0d Merge pull request #9186 from Senorsen/patch-1
Fix contributions calendar empty problem under mysql
2015-04-27 11:20:24 +03:00
Dmitriy Zaporozhets f3ffd7d0b1 Merge branch 'rs-capybara-screenshot' into 'master'
Add capybara-screenshot gem

This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code.

Also reduces the timeout for Capybara tests when not in a CI environment.

See merge request !578
2015-04-27 07:43:45 +00:00
Dmitriy Zaporozhets b4317b1656 Merge branch 'fix-gitorious-importer' into 'master'
Get Gitorious importer to work again.

Fixes #1504.

See merge request !576
2015-04-27 07:42:32 +00:00
Dmitriy Zaporozhets 57759c9aee Merge branch 'forked-event' into 'master'
Use Projects::CreateService to fork projects so that after-create hooks are run.

Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run.

See merge request !575
2015-04-27 07:41:20 +00:00
Dmitriy Zaporozhets 817d93e860 Merge branch 'snippet-default-visibility' into 'master'
Add new admin settings

Add new settings to the admin web UI for default project and snippet visibility levels.  See #2027.

### New settings:

![default_visibility_settings](https://dev.gitlab.org/gitlab/gitlabhq/uploads/bd6d296e39ea3c90ca6a5254b8eb1fef/default_visibility_settings.png)

See merge request !1795
2015-04-27 07:40:33 +00:00
Dmitriy Zaporozhets 6de7f94f00 Merge branch 'rs-minor-styles' into 'master'
Minor design change grab-bag 🎉

I started with one simple change and found a few more, so here they are.

### Simplify icon style selectors

All FontAwesome icons have an `fa` class, so just use that.

### Don't override color of code blocks in notes

This was a pet peeve of mine.

| Before | After |
|:------:|:-----:|
| ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) | ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) |

### Items with tooltips don't need a 'data-original-title' attribute

This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute

### Fix Profile > Design live-updating

`ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated.

This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.

### Remove the `has_bottom_tooltip` class

Bootstrap's tooltip JS can read the placement from a `data-placement` attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method.

See merge request !569
2015-04-27 07:36:42 +00:00
Robert Schilling bafcee93b0 Merge pull request #9213 from bbodenmiller/patch-1
google -> Google
2015-04-27 09:25:22 +02:00
Stan Hu ef0055b52d Fix bug where commit data would not appear in some subdirectories
The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76e) caused slashes in a tree to be escaped automatically.
Using wildcard globs prevents this behavior.

Closes #1478, #1459
2015-04-26 23:52:40 -07:00
Ben Bodenmiller 7098b7bbe0 google -> Google 2015-04-26 17:24:09 -07:00
Sullivan SENECHAL 76e720dfa9 Bootstrap 3.3.4 2015-04-27 00:00:17 +02:00
Sullivan SENECHAL 570594a469 Fix '.container or .container-fluid should be the first child inside of a .navbar' issue 2015-04-26 23:32:35 +02:00
Sullivan SENECHAL 4ca2b99f47 Fix "<head> is missing X-UA-Compatible <meta> tag that disables old IE compatibility modes" 2015-04-26 22:49:12 +02:00
Jeroen van Baarsen 618dc4cd7c Merge pull request #9206 from dsander/hipchat-options
Add notify and color options to HipchatService
2015-04-26 22:32:04 +02:00
Dominik Sander 3c3b43b0a0 Add notify and color options to HipchatService
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
2015-04-26 22:00:51 +02:00