home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,899 Commits 48 Branches 340 Tags
aef6123d32c7e4b161fc5cedd5f150edd39a3ac4
Commit Graph
15899 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling aef6123d32 Merge pull request #9189 from rockneverdies55/patch-1 
Removed "unreleased" from v7.10 changelog
 2015-04-25 18:39:16 +02:00
rockneverdies55 75f72a2ff4 Removed "unreleased" from v7.10 changelog 
Version 7.10 is already released so "unreleased" text next to it in the changelog file can be removed.
 2015-04-24 13:17:51 -04: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
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
Dmitriy Zaporozhets 2a3b724cf8 Merge branch 'canonical-source' into 'master' 
Make source code on GitLab more prominent.

See merge request !1741
 2015-04-24 13:32:12 +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 456e3a7000 Update schema. 2015-04-24 14:49:23 +02:00
Douwe Maan 2fd47a0e95 Don't attempt to move if original path only contains periods. 2015-04-24 14:49:23 +02:00
Douwe Maan 4934bc0312 Change migration timestamp. 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 164a29df86 Move changelog item tot 7.11. 2015-04-24 14:47:50 +02:00
Douwe Maan 1d2a5ee188 Revert "Revert disallowing usernames to end in period." 
This reverts commit c75c6b840b.
 2015-04-24 14:47:49 +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 077a8ec270 Fix tests. 2015-04-24 12:31:57 +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 4dd2f88133 Update changelog. 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 160799ca9b Merge branch 'rs-sam-to-dmitriy' into 'master' 
Change "Sam" to "Dmitriy" in feature steps

"Sam" was too short and generic and caused invalid test failures due to finding other people with names like "Sammie" or "Samuel" unexpectedly.

See https://ci.gitlab.com/projects/1/builds/35205 and https://ci.gitlab.com/projects/1/builds/35093 as two recent examples.

See merge request !571
 2015-04-24 09:47:58 +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
Stefan Tatschner 149d67f761 Try to fix tests for pull request #9065 
This crappy test framework stuff fails randomly. So I can't reliably
run it on my local machine.
 2015-04-24 09:36:52 +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 9b330859bf Change "Sam" to "Dmitriy" in feature steps 
"Sam" was too short and generic and caused invalid test failures due to
finding other people with names like "Sammie" or "Samuel" unexpectedly.
 2015-04-23 18:59:57 -04: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
Dmitriy Zaporozhets 05f0bbff0e Merge branch 'rs-issue-2266' into 'master' 
Add default_url_options initializer

Fixes #2266

See merge request !1791
 2015-04-23 19:18:51 +00:00
Dmitriy Zaporozhets db3bd62c2c Merge branch 'rs-fixed-width-nav' into 'master' 
Use fixed width icons in all nav sidebars

| Before (watch the Network and Graphs icons as the sidebar collapses): | After: |
| :--------: | :------: |
|![Screen_Recording_2015-04-23_at_02.31_PM.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/338aa382ff7609978cd900db29379f3f/Screen_Recording_2015-04-23_at_02.31_PM.mov.gif)|![Screen_Recording_2015-04-23_at_02.30_PM.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/24af635f253688690b42da60271e7afb/Screen_Recording_2015-04-23_at_02.30_PM.mov.gif)|

Uses the `icon` helper, because I can't help myself!

See merge request !566
 2015-04-23 19:11:24 +00:00
Robert Speicher 429fe505bd Use fixed width icons in all nav sidebars 2015-04-23 14:29:00 -04:00