home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +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
Robert Speicher 382a0aa6ef Add Gitlab::Markdown::TableOfContentsFilter 
Removes header and table of contents processing from Redcarpet renderer.
 2015-04-30 16:35:25 -04:00
Robert Speicher 286c9e6886 Add a feature spec for our entire Markdown parsing stack 2015-04-30 16:35:25 -04:00
Douwe Maan 001c9731e6 Merge branch 'upgrader-7.10.1' into 'master' 
Update upgrader doc to point to 7.10.1.

See merge request !594
 2015-04-30 20:15:22 +00:00
Douwe Maan cb40918930 Update upgrader doc to point to 7.10.1. 2015-04-30 22:14:19 +02:00
Stan Hu ee92dd1683 Unescape branch names in compare commit 
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
 2015-04-30 12:44:46 -07:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan e0a1d54e1a Don't ignore any folder called tags :| 2015-04-30 21:32:44 +02:00
Douwe Maan 8c4b6d426d Set head panel title of help section. 2015-04-30 21:28:07 +02:00
Douwe Maan 610ed70f77 Humanize help page titles. 2015-04-30 21:26:24 +02:00
Douwe Maan 0a63c1d2ab Have tree page title read "Files" for root. 2015-04-30 21:18:27 +02:00
Douwe Maan 6fcdd1504e Capitalize "Git Access" in page title. 2015-04-30 21:15:56 +02:00
Douwe Maan 9508bdc0c9 Include ref in network page title. 2015-04-30 21:14:26 +02:00
Douwe Maan f723968374 Include commit message in page title. 2015-04-30 21:12:31 +02:00
Douwe Maan 4d7759156b Plural instead of singular. 2015-04-30 21:10:42 +02:00
Douwe Maan 635c86114f Fix snippest sidebar when signed out. 2015-04-30 21:10:34 +02:00
Douwe Maan 280a212443 Fix Profiles::PasswordsController. 2015-04-30 20:37:25 +02:00
Douwe Maan 5121576e0c before_action > before_filter. 2015-04-30 20:02:21 +02:00
Douwe Maan a3bd323cd3 Remove an old determine_layout call. 2015-04-30 20:02:00 +02:00
Douwe Maan 2f4426b7e4 Merge branch 'fix-project-tags' into 'master' 
Fix DB error when trying to tag a repository

Steps to reproduce: Go to a project settings, add tags, click on save changes

Observed behavior: Error 500

```
    PG::Error: ERROR:  column "taggings_count" does not exist
        LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
```

Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
migration that created the `tags` and `taggings` table, and added the rest.

* Closes #1512
* Closes #1550
* Closes https://github.com/gitlabhq/gitlabhq/issues/6867
* Closes https://github.com/gitlabhq/gitlabhq/issues/9194

See merge request !577
 2015-04-30 17:20:36 +00:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Douwe Maan f2cf6d75ec Merge branch 'show-invalid-projects-google-code-import' into 'master' 
Show incompatible projects in Google Code import status

Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.

Closes #1531

## Screenshots

Before:

![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png)

After with no projects available (notice the button is hidden):

![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png)

After with 1 valid and 1 incompatible project:

![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png)

See merge request !586
 2015-04-30 17:08:45 +00:00
Dmitriy Zaporozhets 6d22e96744 Merge branch 'fix-submodule-error-with-forked-project' into 'master' 
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules

## What does this MR do?

This MR fixes an error that occurs when viewing diffs in a forked project with submodules.

### Are there points in the code the reviewer needs to double check?

Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test.

### Why was this MR needed?

A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1413

See merge request !512
 2015-04-30 16:47:35 +00:00
Dmitriy Zaporozhets a06354485c Merge branch 'Soullivaneuh-show-aside' 2015-04-30 19:40:45 +03:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Dmitriy Zaporozhets 26c62cb036 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-30 19:38:25 +03:00
Dmitriy Zaporozhets c93020c47f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-30 19:37:31 +03:00
Dmitriy Zaporozhets 32d7841b2c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/_head_panel.html.haml
 2015-04-30 19:36:45 +03:00
Dmitriy Zaporozhets 86b752e0cf Merge branch 'Soullivaneuh-container-class-reloaded' 2015-04-30 19:34:12 +03:00
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
Stan Hu d79348ab55 Fix Error 500 when searching Wiki pages 
Closes #1547
 2015-04-30 08:54:08 -07:00
Dmitriy Zaporozhets 9faa00a7df Merge branch 'wip-means-no-mr' into 'master' 
Don't allow a merge request to be merged when its title starts with "WIP".

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078

![Screen_Shot_2015-04-30_at_15.47.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9035743e6f482a9c31cf86d84388074c/Screen_Shot_2015-04-30_at_15.47.03.png)

See merge request !590
 2015-04-30 15:20:16 +00:00
Jeroen van Baarsen 9a90eea768 Merge pull request #9232 from jverdeyen/hotfix/upgrade_docs_typo 
Update 7.9-to-7.10.md
 2015-04-30 16:23:35 +02:00
Douwe Maan d386bb7808 Allow primary email to be set to an email that you've already added. 2015-04-30 16:17:03 +02:00
Stan Hu 9c76a6fa96 Show incompatible projects in Google Code import status 
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.

Closes #1531
 2015-04-30 06:56:49 -07:00
Douwe Maan 7e0eb486ed Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
Joeri Verdeyen 81f6495858 Update 7.9-to-7.10.md 2015-04-30 13:22:28 +02:00
Dmitriy Zaporozhets 39a55bdf1a Merge branch 'search-layout' into 'master' 
Improvements to search layout

Improve search layout to match new UI style and make it more mobile-firendly

See merge request !585
 2015-04-29 18:40:16 +00:00
Dmitriy Zaporozhets 5bf9f69df7 Fix visibility settings UI in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-29 20:32:48 +03:00
Dmitriy Zaporozhets 4636c1ddac Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-29 20:27:06 +03:00
Douwe Maan 1a6d886e0d Merge branch 'footnotes-markdown' into 'master' 
Add footnotes support to Markdown

This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555

See merge request !572
 2015-04-29 17:17:20 +00:00
Douwe Maan 5d5e746767 Merge branch 'refactor-service-settings' into 'master' 
Move service template and project service settings into a shared view

This MR reconciles the small differences in the error message layout between the template and project settings, and moves the partial into a shared view. This came from a mention in https://github.com/gitlabhq/gitlabhq/issues/9181 to take care of this.

See merge request !588
 2015-04-29 17:16:21 +00:00
Dmitriy Zaporozhets 7534d0ef46 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-29 19:52:25 +03:00
Sytse Sijbrandij f75eeff5a1 Merge branch 'Add_phrase_close_multiple_issues' into 'master' 
Add phrase "Here's how to close multiple issues in one commit message"

Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users.

cc/ @sytse

See merge request !1801
 2015-04-29 16:45:18 +00:00
Stan Hu 808b05e974 Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07: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