home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 28639a1971 For navless pages render dashboard nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 20:10:38 +03:00
Ioannis Kappas 3196c52969 added fieldset support to project and admin services views. 
split field logic to separate template.
 2015-04-22 20:04:03 +03:00
Dmitriy Zaporozhets 47d26b05a4 Fix snippets tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 18:25:09 +03:00
Dmitriy Zaporozhets 0261a5e222 Fix wording and remove duplicate link 2015-04-22 18:18:11 +03:00
Dmitriy Zaporozhets 4a63573b21 Start applying new layout to snippets pages 2015-04-22 18:17:43 +03:00
Dmitriy Zaporozhets 27919e25e8 Add gitlab logo on login page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 18:02:29 +03:00
Dmitriy Zaporozhets c41a5bf3cd Restyle explore page to sidebar layout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 17:28:44 +03:00
Dmitriy Zaporozhets 5647ce75b3 No need in empty head panel on login page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:54:39 +03:00
Dmitriy Zaporozhets 4860c4dc07 Fix toggle of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:48:39 +03:00
Job van der Voort b5ee60c512 Merge branch 'update_slack_doc' into 'master' 
Updated Slack documentation

Fixes #2234

Updated the Slack documentation to include the new fields located in the service's settings.

/cc @karen

See merge request !1788
 2015-04-22 13:48:12 +00:00
Dmitriy Zaporozhets 0e0325ee99 Merge branch 'rs-issue-2257' into 'master' 
Recover from URI::Error

`URI::Error` is the base class for all URI errors.

Fixes #2257 and #2260

See merge request !1789
 2015-04-22 13:04:46 +00:00
Marin Jankovski 45025fecf2 Merge branch 'missing-upgrade-doc' into 'master' 
add 7.9-7.10 upgrade doc

See merge request !560
 2015-04-22 13:00:47 +00:00
Job van der Voort 6fee85900b add 7.9-7.10 upgrade doc 2015-04-22 12:51:22 +00:00
Dmitriy Zaporozhets 2bac3ac75c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-22 15:08:57 +03:00
Nihad Abbasov c3f2de68b5 Merge pull request #8831 from bladealslayer/fix/api-user-tests 
Fix user API tests succeeding for the wrong reason
 2015-04-22 16:55:27 +05:00
Dmitriy Zaporozhets 1cf07f6ba9 Merge branch 'update_grack' into 'master' 
Update gitlab-grack to 2.0.2.

Updating to grack version 2.0.2 to fix an issue with smart http clients.

See merge request !559
 2015-04-22 10:06:05 +00:00
Marin Jankovski 9ba85ffe88 Update gitlab-grack to 2.0.2. 2015-04-22 11:19:40 +02:00
Marin Jankovski 8d9c7305cd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-22 11:17:09 +02:00
Marin Jankovski 193f905072 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-22 11:17:01 +02:00
Dmitriy Zaporozhets 2c4eef5899 Merge branch 'rs-remove-gitlab-pipeline' into 'master' 
Remove html-pipeline-gitlab

Ports the custom emoji filter to the app itself.

See merge request !1781
 2015-04-22 09:06:03 +00:00
Dmitriy Zaporozhets 3ae9b696f6 Merge branch 'rs-toggle-tab' into 'master' 
Fix tab behavior on MergeRequests#new

Missed this one in 269aee790c

Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents.

See merge request !556
 2015-04-22 07:54:18 +00:00
Jeroen van Baarsen 5e9d4a08a5 Merge pull request #9164 from dsander/fix-markdown-preview 
Make issue preview look like the result
 2015-04-22 08:37:27 +02:00
Jeroen van Baarsen 0ef2fcde24 Merge pull request #9059 from chulkilee/fix-hipchat 
do not send empty message to hipchat
 2015-04-22 08:36:27 +02:00
Boyan Tabakov e5b32f3c20 Fix user API tests succeeding for the wrong reason 
The requests were missing multiple required attributes, while testing for single attribute missing.
Added test for checking username as required attribute.
 2015-04-22 08:03:38 +03:00
Robert Speicher c917b26f41 Recover from all URI::Errors 
Fixes #2257
Fixes #2260
 2015-04-21 22:02:44 -04:00
Chulki Lee 681fb7def6 do not send empty message to hipchat 2015-04-22 08:05:19 +09:00
Dominik Sander 34b976fd27 Make issue preview look like the result 2015-04-21 22:16:53 +02:00
Robert Speicher 3ceb888d79 Fix tab behavior on MergeRequests#new 2015-04-21 15:19:06 -04:00
Patricio Cano 65c83f8a22 Updated the Slack documentation 2015-04-21 12:25:37 -05:00
Robert Speicher 870969a1b2 More cleanup of gitlab_markdown_helper_spec 2015-04-21 13:12:19 -04:00
Robert Speicher f9c0f0782b Use Nokogiri in link_to_gfm specs 
Didn't like relying so much on Regex matches
 2015-04-21 12:53:42 -04:00
Robert Speicher fca624670a Update Gitlab::Markdown to use the 🆕 EmojiFilter ✨ 
Removes emoji-centric tests from GFM specs 💥
 2015-04-21 12:53:42 -04:00
Robert Speicher 4ced630fed Add Gitlab::Markdown::EmojiFilter 2015-04-21 12:53:42 -04:00
Robert Speicher 837dc328bf Change html-pipeline-gitlab gem to html-pipeline 2015-04-21 12:53:42 -04:00
Dmitriy Zaporozhets d7f61affaf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-21 19:45:27 +03:00
Dmitriy Zaporozhets 0a23688c14 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-21 19:44:52 +03:00
Dmitriy Zaporozhets 2cd501f7e4 Merge branch 'rs-reference-filters' into 'master' 
Convert GFM reference handling to html-pipeline filters

- `Gitlab::Markdown` is now much cleaner
- Better separation of concerns
- Cleaner, less brittle, more maintainable specs for each reference type.
- Label references actually work!

See merge request !1753
 2015-04-21 16:43:54 +00:00
Dmitriy Zaporozhets 58faf307d2 Merge pull request #8510 from koebi001/feature/backup_restore 
add environment variable force to the documentation
 2015-04-21 19:04:59 +03:00
Hannes Rosenögger c8301914e8 Merge branch 'fix-duplicate-changelog-entry' into 'master' 
Remove entry that was shipped in v7.9.1

See merge request !532
 2015-04-21 14:15:57 +00:00
Dmitriy Zaporozhets 1e7c4a25fd Small css cleanup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:49:25 +03:00
Dmitriy Zaporozhets 9f032b9c2a Move header css from pages to generic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:35:45 +03:00
Dmitriy Zaporozhets 6e6df3b830 Refactor themes for new UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 16:35:11 +03:00
Douwe Maan 51ad59e0d8 Fix bug causing @whatever inside code blocks to sometimes be picked up as a user mention. 2015-04-21 14:58:18 +02:00
Dmitriy Zaporozhets 6750e2d53f Merge branch 'upgrade-guide-gitlab-shell' into 'master' 
7.10 requires gitlab-shell 2.6.2.

Fixes #1467.

See merge request !552
 2015-04-21 12:48:07 +00:00
Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
 2015-04-21 15:36:58 +03:00
Dmitriy Zaporozhets 86dfdc36bd Merge branch 'google-code-fixes' into 'master' 
Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551
 2015-04-21 12:32:00 +00:00
Dmitriy Zaporozhets d3059c7d29 New colorful design of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-21 15:31:32 +03:00
Dmitriy Zaporozhets eca214a671 Merge branch 'gitlab-grack-2.0.1' into 'master' 
Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies.

Addresses #1461 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2253.

This regression was introduced between 7.9 and the 7.10 rcs, so no changelog item for 7.10 proper.

cc @JobV @jacobvosmaer

See merge request !546
 2015-04-21 10:41:59 +00:00
Jeroen van Baarsen d128bc9241 Merge pull request #9058 from chulkilee/upgrade-hipchat 
upgrade hipchat
 2015-04-21 11:45:48 +02:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00