Commit Graph
8955 Commits
Author SHA1 Message Date
Robert Speicher 38634b4777 There's no longer a reason to re-render the header on Design updates 2015-04-25 14:03:40 -04:00
Robert Speicher e8faf9178a 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.
2015-04-25 14:03:40 -04:00
Robert Speicher c597b5d09d 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.
2015-04-25 14:03:40 -04:00
Robert Speicher 3f2f40aa43 Items with tooltips don't need a 'data-original-title' attribute
Bootstrap's tooltip JS just uses the `title` attribute.
2015-04-25 14:03:40 -04:00
Robert Speicher 66e23b555f Don't override color of code blocks in notes 2015-04-25 14:03:40 -04:00
Robert Speicher e0262ee0a0 Simplify icon style selectors
All FontAwesome icons have an `fa` class, so just use that.
2015-04-25 14:03:40 -04:00
Douwe Maan c2f11f3209 Get Gitorious importer to work again. 2015-04-24 23:30:12 +02:00
Douwe Maan 0cf76a0b70 Use Projects::CreateService to fork projects so that after-create hooks are run. 2015-04-24 22:58:27 +02:00
Douwe Maan 439b9f50af Merge branch 'fix-slack-channel-in-admin-settings' into 'master'
Fix bug where Slack service channel was not saved in admin template settings

Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181
Closes #1501

See merge request !574
2015-04-24 16:32:09 +00:00
Robert Speicher ea9089647c Merge branch 'rs-simplify-uploads-controller' into 'master'
Simplify the `skip_before_action` logic for UploadsController

See merge request !547
2015-04-24 16:26:32 +00:00
Dmitriy Zaporozhets 54d7962fb4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-24 19:02:26 +03:00
Dmitriy Zaporozhets 34e14b1ca7 Merge branch 'mobile-ui-improvements' into 'master'
Improve mobile UI for dashboard and project pages

Some love for mobile UI 😃

## Before
- - -
![Screenshot_2015-04-24-17-42-59](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/827f9cefa477fc7f0d1b2d56e479a35c/Screenshot_2015-04-24-17-42-59.png)
![Screenshot_2015-04-24-17-27-01](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/698eb90033d40ea7de9f599364a34d0e/Screenshot_2015-04-24-17-27-01.png)

## After
- - -

![Screenshot_2015-04-24-17-16-08](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/7e3ad8bc18800f63a7be20ea31ccfd3b/Screenshot_2015-04-24-17-16-08.png)
![Screenshot_2015-04-24-17-39-18](https://gitlab.com/dzaporozhets/gitlab-ce/uploads/cde3379836530d95e94922ba5c200cef/Screenshot_2015-04-24-17-39-18.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !573
2015-04-24 16:01:10 +00:00
Stan Hu 2f04599751 Fix bug where Slack service channel was not saved in admin template settings.
Consolidate allowed parameters in one place to avoid these kinds of bugs in the future.

Closes https://github.com/gitlabhq/gitlabhq/issues/9181
2015-04-24 08:33:24 -07:00
Douwe Maan 571ba5a7fe Protect OmniAuth request phase against CSRF. 2015-04-24 17:03:18 +02:00
Dmitriy Zaporozhets f912650ded Improve mobile UI for dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-24 17:39:53 +03:00
Douwe Maan b8c4215969 Merge branch 'username-period-again' into 'master'
Don't allow username to end in period.

Fixes #2174 and #2249.

cc @jacobvosmaer Please review and test with the GitLab.com dump.

See merge request !1786
2015-04-24 14:16:08 +00:00
Marin Jankovski 62117f2f25 Merge branch 'add_count_to_state_filters' into 'master'
Add issue and merge request count for state filters.

Related to issue #2170

Changes relate to project issues and merge request pages, dashboard and group pages remain the same.

See merge request !1747
2015-04-24 14:08:40 +00:00
Douwe Maan 5f839770e7 Revert "Rename namespace_regex to namespace_path_regex."
This reverts commit c0116926c7.
2015-04-24 15:16:38 +02:00
Douwe Maan 70f9893ed6 Explain namespace clearn regex. 2015-04-24 14:49:23 +02:00
Douwe Maan fac1f83fd5 Properly migrate users with usernames like "." or "..". 2015-04-24 14:49:23 +02:00
Douwe Maan c0116926c7 Rename namespace_regex to namespace_path_regex. 2015-04-24 14:49:22 +02:00
Douwe Maan 6ae606d81f Merge branch 'commit-project' into 'master'
Link cross-project cross-reference notes to correct project.

- Fixes #1431: Don't crash when an MR from a fork has a cross-reference comment from the target project on of its commits.
- Include commit comments in MR from a forked project.

To accomplish this, the Commit model needs to know about its project. Adding this attribute also simplifies a bunch of other methods that deal with a note's target, that previously had to have special logic for when it belonged to a commit.

See merge request !554
2015-04-24 12:46:39 +00:00
Dmitriy Zaporozhets 9409f2a3b3 Merge pull request #9065 from rumpelsepp/issues
Tweak issue page a bit
2015-04-24 15:01:27 +03:00
Marin Jankovski 219cbf3927 Check if project before calling count on issuable. 2015-04-24 13:53:22 +02:00
Marin Jankovski 6977810360 Add issue and merge request count for state filters. 2015-04-24 13:53:21 +02:00
Douwe Maan 04020d5e20 Explain purpose and usage. 2015-04-24 12:31:16 +02:00
Douwe Maan 6f8ff08c65 Fix behavior for Enumerable-like ActiveRecord relations. 2015-04-24 12:31:16 +02:00
Douwe Maan 889832578a Fix small issues. 2015-04-24 12:31:16 +02:00
Douwe Maan 0db79443ee Satisfy Rubocop. 2015-04-24 12:30:37 +02:00
Douwe Maan 2456695422 Fix errors. 2015-04-24 12:30:37 +02:00
Douwe Maan 4f2e4c7656 Select MR commit notes from source project. 2015-04-24 12:30:37 +02:00
Douwe Maan e739eb036d Move participants method to shared Participable concern. 2015-04-24 12:30:36 +02:00
Douwe Maan 0ff778c0f4 Link cross-project cross-reference notes to correct project. 2015-04-24 12:30:36 +02:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan 8ed7ac9d44 Use project.commit convenience method. 2015-04-24 12:29:36 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets b0ed2ff1a6 Merge branch 'atom-feeds-everywhere' into 'master'
Add project activity atom feed and show atom feed buttons everywhere where applicable.

See merge request !555
2015-04-24 10:15:13 +00:00
Dmitriy Zaporozhets 0e998876d8 Fix align of issue status box with close/edit buttons to the right
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-24 12:03:25 +03:00
Dmitriy Zaporozhets c697d96043 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-24 11:40:01 +03:00
Guillaume Delbergue 5f2e8b6147 Add footnotes support to Markdown
Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
2015-04-24 10:00:31 +02:00
Stefan Tatschner 4beb295b89 Tweak merge requests
* Include creation time
* Include author without avatar
* Move assignee to the right
* Include comments counter by default, gray it out when there are 0
  comments.
2015-04-24 09:36:50 +02:00
Stefan Tatschner dbd0fd20a9 Tweak issue page
* Include creation time
* Include author without avatar
* Move assignee to the right
* Remove action buttons. IMO they are useless and a bit annoying
* Include comments counter by default, gray it out when there are 0
  comments.
2015-04-24 09:36:42 +02:00
Robert Speicher 3ae31c2282 Merge branch 'rs-update-d3-atwho' into 'master'
Update d3_rails and jquery-atwho-rails

We were a bit behind on these JS libs, so this updates them.

AtWho made a few API changes for which I had to update our usage.

Should fix #1457 as well.

See merge request !542
2015-04-23 22:55:07 +00:00
Dmitriy Zaporozhets c30079f3f4 Merge branch 'rs-mentionable-examples-refactor' into 'master'
Update mentionable shared examples to be (a bit) more understandable

These shared examples were super confusing, and honestly still kind of are, but they should be a bit better now.

I encountered a bunch of headaches in these examples while refactoring ReferenceExtractor, so that's how I ended up changing it.

See merge request !1780
2015-04-23 20:50:48 +00:00
Robert Speicher 429fe505bd Use fixed width icons in all nav sidebars 2015-04-23 14:29:00 -04:00
Robert Speicher 10053b173d Simplify the skip_before_filter logic for UploadsController 2015-04-23 13:15:47 -04:00
Robert Speicher 85bbb91476 Fix GfmAutoComplete for jquery-atwho 1.0 2015-04-23 13:08:16 -04:00
Dmitriy Zaporozhets 926a814641 Improve navbar toggle for mobile devices
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-23 18:21:59 +03:00
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan cd450221eb Rename "News Feed" buttons to "Activity Feed" 2015-04-23 17:11:39 +02:00