home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,370 Commits 48 Branches 340 Tags
f3d4f2eac7bcf787a00a6cff694fbfa8969830f4
Commit Graph
23370 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Frye f3d4f2eac7 Fix Rubocop error 2016-01-28 14:44:45 -05:00
Josh Frye c95bc65519 Update tests 2016-01-28 13:04:42 -05:00
Josh Frye f9218898ec [WIP] Background process note logic for #3948 2016-01-28 13:04:42 -05:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master' 
Save list sort in a cookie

Closes #5546 

See merge request !2537
 2016-01-28 16:21:04 +00:00
Dmitriy Zaporozhets ee8884c68e Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into 'master' 
Fix preventing migration from crashing in very specific cases

Closes #12606. Closes #12501.

/cc @yorickpeterse @dbalexandre 

See merge request !2600
 2016-01-28 15:20:14 +00:00
Dmitriy Zaporozhets ef42af9a8a Merge branch 'improve-mr-api' into 'master' 
Improve consistency and duplication for Merge Request API

* Follow REST for merge request API route
* Remove repeating comments API for MR

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

Fixes #4759 and #11810 

See merge request !2639
 2016-01-28 14:50:03 +00:00
Jacob Schatz 695fb209b7 Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' 
Removed sorted text from dropdowns

![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png)

Closes #12796 

cc @creamzy @jschatz1 

See merge request !2635
 2016-01-28 14:11:05 +00:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API 
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-28 14:26:12 +01:00
Dmitriy Zaporozhets 9bf47f06ab Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' 
Makes ol margin big enough for 3 digits.

Fixes #7960 

![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png)


See merge request !2608
 2016-01-28 13:07:26 +00:00
Dmitriy Zaporozhets 6748520de6 Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' 
Adds feature: Ajax Close/Open updates discussion automatically

Triggers jQuery event <br/>
Fixes #5544

See merge request !2610
 2016-01-28 13:05:50 +00:00
Rémy Coutable 55ab92c00b Use ActiveRecord::Base.connection.active? and rescue any exception in connect_to_db? 
This ensures that rake tasks that don't need a DB connection can be run
without one.
 2016-01-28 12:23:37 +01:00
Rémy Coutable 869b4d7c6a Only create the defaults ApplicationSetting when DB is fully migrated 
Return a fake application settings OpenStruct when this is not the case.
Also, use ActiveRecord::Base.connection_pool.active_connection? instead
of ActiveRecord::Base.connection.active? to avoid driver exception.
 2016-01-28 11:26:28 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Robert Speicher ca171b8190 Update gitlab-workhorse versions in documentation 
[ci skip]
 2016-01-27 18:30:36 -05:00
Robert Speicher 716892b4fd Update CHANGELOG 
[ci skip]
 2016-01-27 17:48:52 -05:00
Douwe Maan f025f80d5c Merge branch 'update-ruby-2.2.4' into 'master' 
Update Ruby version to 2.2.4 (latest previous stable) and update docs

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. 

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

See merge request !2534
 2016-01-27 21:39:08 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master' 
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415

See merge request !2613
 2016-01-27 21:20:16 +00:00
Robert Speicher 614025da38 Merge branch 'rs-skip-2fa-on-signout' into 'master' 
Skip the 2FA requirement during logout

See merge request !2581
 2016-01-27 21:17:31 +00:00
Robert Speicher 8c6231d184 Update CHANGELOG 
[ci skip]
 2016-01-27 16:15:49 -05:00
Robert Speicher 27893b972d Merge branch 'diff-colors' into 'master' 
Increase contrast between highlighted code comments and inline diff marker.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737.

It was especially bad in Monokai, better now.

See merge request !2629
 2016-01-27 20:59:27 +00:00
Robert Speicher 40403c78ef Merge branch 'fix-ci-runners-version-update' into 'master' 
Fix CI runner version not being properly updated when asked for a build

Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.

See merge request !2618
 2016-01-27 20:50:24 +00:00
Rubén Dávila 0ee875f961 Align filter dropdown. 2016-01-27 15:21:27 -05:00
Robert Speicher 56538f9cc1 Merge branch 'fix/unexistent-group-500' into 'master' 
Return a 404 instead of a 500 when accessing a non-existent group

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600

See merge request !2614
 2016-01-27 20:19:35 +00:00
Dmitriy Zaporozhets 4dea268215 Merge branch 'rs-require-jquery-ui' into 'master' 
Limit jquery-ui requires to what we actually use



See merge request !2274
 2016-01-27 19:14:20 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master' 
Update wording for 2FA requirement notice



See merge request !2582
 2016-01-27 19:04:44 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Dmitriy Zaporozhets 5e48c1b851 Merge branch 'rs-bump-octokit' into 'master' 
Bump octokit to `~> 3.8.0`

Closes #2877

See merge request !2536
 2016-01-27 17:20:21 +00:00
Douwe Maan 1226d16675 Merge branch 'hot-reloading' into 'master' 
Fix hot reloading for CI API



See merge request !2617
 2016-01-27 15:26:59 +00:00
James Lopez 47e0d6b162 updated README to include Ruby 2.1 2016-01-27 16:19:16 +01:00
James Lopez e862af9537 merge spec and spinach jobs 2016-01-27 16:16:03 +01:00
Douwe Maan 606f8e9190 Increase contrast between highlighted code comments and inline diff marker. 2016-01-27 16:08:42 +01:00
James Lopez 683770f35d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 2016-01-27 15:42:35 +01:00
James Lopez b8ed5789c0 update gitlab ci settings to include ruby 2.1 images 2016-01-27 15:41:05 +01:00
James Lopez 1b84de573d updated docs to reflect min requirement of 2.1 [ci skip] 2016-01-27 14:48:15 +01:00
Kamil Trzcinski 95d2f0fb51 Fix CI runner version not being properly updated when asking for a build 
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.

This MR adds test to check that such scenario will never happen again.
 2016-01-27 12:04:54 +01:00
Achilleas Pipinellis a93f7099fa Merge branch 'doc_forking_refactor' into 'master' 
Refactor forking workflow documentation

Closes #5974 

See merge request !2623
 2016-01-27 11:04:02 +00:00
Achilleas Pipinellis b6662c2a89 Refactor the forking process and add new images 
[ci skip]
 2016-01-27 12:00:51 +01:00
James Lopez afde800b25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-group-500 2016-01-27 11:35:13 +01:00
Achilleas Pipinellis af52158ff8 Conform to doc styleguide on max line length 2016-01-27 11:26:04 +01:00
James Lopez 5eb936dc31 moved and refactored feature based on feedback. Also updated CHANGELOG 2016-01-27 11:23:28 +01:00
James Lopez eef9c9d447 update fix based on feedback 2016-01-27 10:44:24 +01:00
Yorick Peterse de7c9c7ab1 Use Atom update times of the first event 
By simply loading the first event from the already sorted set we save
ourselves extra (slow) queries just to get the latest update timestamp.
This removes the need for Event.latest_update_time and significantly
reduces the time needed to build an Atom feed.

Fixes gitlab-org/gitlab-ce#12415
 2016-01-27 10:33:33 +01:00
Kamil Trzciński 5e0ee54c6c Merge branch 'fix/commit-status-artifacts' into 'master' 
Use generic method to checks if artifacts are available

Closes #12626

See merge request !2576
 2016-01-27 09:07:47 +00:00
Achilleas Pipinellis 97089f573e Merge branch 'typo_in_artifacts_doc' into 'master' 
Fix typo on artifacts doc



See merge request !2622
 2016-01-27 08:04:59 +00:00
Achilleas Pipinellis a427ab9faa Fix typo on artifacts doc 
[ci skip]
 2016-01-27 09:02:02 +01:00
Robert Speicher 84427dc6d5 Update CHANGELOG 
[ci skip]
 2016-01-26 16:18:10 -08:00
Robert Speicher cb83b95ea5 Merge branch 'master' into 'master' 
Update ExternalIssue regex for JIRA integration

The pattern in the `::reference_pattern` class method in the
`ExternalIssue` model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.

See merge request !2598
 2016-01-27 00:13:49 +00:00
Blake Hitchcock 4be65c3231 Update ExternalIssue regex for JIRA integration 
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
 2016-01-26 15:55:40 -05:00
Dmitriy Zaporozhets 95c644dfa2 Merge branch 'bug/jschatz1/file-browser-lines' into 'master' 
Bug/jschatz1/file browser lines

Fixes #12725 

![Screen_Shot_2016-01-26_at_11.19.39_AM](/uploads/c5f5a143926600e02de4cfc0687ed8dd/Screen_Shot_2016-01-26_at_11.19.39_AM.png)


See merge request !2615
 2016-01-26 20:23:43 +00:00