home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
13452 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets a7dddd1bca Create update doc for 7.7 2015-01-14 17:34:39 -08:00
Dmitriy Zaporozhets 36acf5b293 Revert "Fix tests" 
This reverts commit 1e45ba7f16.
 2015-01-14 17:22:48 -08:00
Dmitriy Zaporozhets 46ed6fb58f Revert "Fix anchor issue with fixed navbar" 
This reverts commit 204b3c121c.
 2015-01-14 17:22:36 -08:00
Dmitriy Zaporozhets 18b7acc399 Merge branch 'fix-anchor-bug' into 'master' 
Fix anchor bug

Fixes #1886

See merge request !1395
 2015-01-15 00:42:55 +00:00
Dmitriy Zaporozhets 1e45ba7f16 Fix tests 2015-01-14 16:23:20 -08:00
Dmitriy Zaporozhets 204b3c121c Fix anchor issue with fixed navbar 
When use anchors - conetent gets hidden under navbar. This commit fixes
with hack using margin+height combination
 2015-01-14 15:22:31 -08:00
Dmitriy Zaporozhets ff7f4a134e Revert "Scroll the readme anchors below the navbar." 
This reverts commit b1792d9e4c.
 2015-01-14 09:57:38 -08:00
Dmitriy Zaporozhets 55947addc3 Revert "When anchor is clicked set the correct condition." 
This reverts commit 5140bd8824.
 2015-01-14 09:56:33 -08:00
Dmitriy Zaporozhets 3bf9b6604b Merge branch 'rescue_database_error' into 'master' 
Rescue database error

We need to check which database is setup but we cannot assume that the database exists already. Not checking this will break rake gitlab:setup for packaging as we need to do asset precompile before the database exists.

See merge request !1393
 2015-01-14 17:34:05 +00:00
Dmitriy Zaporozhets 9920ede257 Merge branch 'enable-signup' into 'master' 
Enable signup by default

See merge request !1394
 2015-01-14 17:32:33 +00:00
Jacob Vosmaer 3c5c1a7802 Enable signup by default 2015-01-14 17:42:44 +01:00
Marin Jankovski e348af1d4c Rescue database error in application settings if the database still doesn't exist. 2015-01-14 09:03:25 +01:00
Dmitriy Zaporozhets 01ab081259 Merge branch 'doorkeeper_update' into 'master' 
Doorkeeper update

https://gitlab.com/gitlab-org/omnibus-gitlab/issues/398

See merge request !1392
 2015-01-14 01:23:53 +00:00
Valery Sizov 1c49c30119 doorkeeper update 2015-01-13 15:46:00 -08:00
Dmitriy Zaporozhets 8ac16a6b32 Cleanup CHANGELOG 2015-01-13 14:47:27 -08:00
Dmitriy Zaporozhets c7e0e4e8a4 Merge branch 'gitlab_shell_bump' into 'master' 
Gitlab shell bump

See merge request !1391
 2015-01-13 20:54:40 +00:00
Valery Sizov 48f81ca7a7 gitlab-shell bump 2015-01-13 12:16:40 -08:00
Dmitriy Zaporozhets be9f5589ed Merge branch 'oauth_api_doc' into 'master' 
OAuth2 API documentation

https://dev.gitlab.org/gitlab/gitlabhq/issues/1713

See merge request !1388
 2015-01-13 19:56:43 +00:00
Dmitriy Zaporozhets 1e37e8924a Improve github import page UI 2015-01-13 11:44:17 -08:00
Dmitriy Zaporozhets 4d03a2803e Update changelog 2015-01-13 10:47:20 -08:00
Dmitriy Zaporozhets 1358152848 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-13 10:45:49 -08:00
Dmitriy Zaporozhets a16d894b21 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-13 10:45:33 -08:00
Dmitriy Zaporozhets 72c3d728c4 Update db schema 2015-01-13 10:45:14 -08:00
Dmitriy Zaporozhets bb1f8b1d8b Merge branch 'github_importer' 
Conflicts:
	app/helpers/projects_helper.rb
 2015-01-13 10:35:16 -08:00
Dmitriy Zaporozhets ef933a4a96 Improve import page 2015-01-13 10:34:01 -08:00
Sytse Sijbrandij e351b26f84 Merge branch 'prose-requirement' into 'master' 
Prose requirement

Feel free to improve or link to authoritative source.

See merge request !285
 2015-01-13 18:27:35 +00:00
Sytse Sijbrandij f26c0fa556 Link to guidelines for interface text. 2015-01-13 10:26:55 -08:00
Sytse Sijbrandij 6cce2be7eb Get rid of here links and simplify text. 2015-01-13 10:20:04 -08:00
Sytse Sijbrandij 34b54ee815 Merge branch 'improve_readme_to_website' into 'master' 
Improve readme to website

addresses some of https://dev.gitlab.org/gitlab/organization/issues/100.

See merge request !1355
 2015-01-13 18:12:45 +00:00
Dmitriy Zaporozhets 9ce7492e58 Merge pull request #8540 from yglukhov/wiki-history 
First entry in wiki history leads to newest revision.
 2015-01-13 10:02:25 -08:00
Dmitriy Zaporozhets 1f01fcdc0c Merge branch 'scroll_below_the_navbar' into 'master' 
Scroll below the navbar

Fixes #1866

Show the markdown anchors by scrolling below the fixed top navbar.

See merge request !1390
 2015-01-13 16:38:59 +00:00
Marc Radulescu 1cdce0f182 revise wording to clarify CE and EE definitions 2015-01-13 15:47:35 +01:00
Marin Jankovski 5140bd8824 When anchor is clicked set the correct condition. 2015-01-13 13:14:32 +01:00
Marin Jankovski b1792d9e4c Scroll the readme anchors below the navbar. 2015-01-13 13:01:50 +01:00
yglukhov c13f420b66 First entry in wiki history leads to newest revision. 2015-01-13 12:17:05 +02:00
Jacob Vosmaer 90e4b400ba Merge branch 'git-http-blacklist' into 'master' 
Git HTTP blacklist

See merge request !1328
 2015-01-13 10:02:49 +00:00
Sytse Sijbrandij 4659a28115 Merge branch 'changelog_guidelines' into 'master' 
Add Changelog Guidelines to monthly.md

Fixes #1868

Added the changelog guidelines according to the issue mentioned above. @sytse I didn't add the extra lines to the 7.7.0 log, since we have a codefreeze soon.

/cc @job

See merge request !1389
 2015-01-13 03:30:03 +00:00
Valery Sizov f07b165ab7 OAuth API documentation update 2015-01-12 19:29:06 -08:00
Patricio Cano e588328674 Fixed wording in message. 2015-01-12 22:26:51 -05:00
Patricio Cano 0be1a45b9f Updated monthly.md add instructions about the handling of the CHANGELOG 
Added DISCLAIMER to CHANGELOG
 2015-01-12 22:19:22 -05:00
Dmitriy Zaporozhets 3103e567bc Merge branch 'fix_constant' into 'master' 
ForbiddenAction constant name fix

See merge request !1387
 2015-01-12 21:19:04 +00:00
Dmitriy Zaporozhets 6774a701a6 Merge branch 'refactor_push_data_builder' into 'master' 
Refactor push data builder

See merge request !1384
 2015-01-12 21:06:35 +00:00
Valery Sizov 058f223b01 ForbiddenAction constant fix 2015-01-12 09:30:52 -08:00
Dmitriy Zaporozhets bba8e59a04 Fix test hook and tests 2015-01-12 09:08:25 -08:00
Dmitriy Zaporozhets 1c6a125389 Merge branch 'mr_widget_remove_source_branch_checkbox' into 'master' 
Mr widget remove source branch checkbox

Fixes #1858

Renamed custom `checkbox` css class for remove source branch checkbox because it was being overwritten on Safari by `checkbox` from bootstrap in `_forms.scss`

After rename, alignment looks corrected

See merge request !1386
 2015-01-12 16:58:32 +00:00
Dmitriy Zaporozhets 6643d38f97 Merge branch 'add_search_option_to_project_api' into 'master' 
Add search option to project api

When using Ajax to search for users authorised projects we need to do a search query on the returned list rather than doing a request using `/search/:query` option.

This MR also adds a simple spec for project ordering feature that got added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/266 but no specs were provided.

See merge request !1385
 2015-01-12 16:57:20 +00:00
Marc Radulescu ce6b0519cc remove duplication by linking EE features directly to website 2015-01-12 16:47:39 +01:00
Marin Jankovski 0a089661fd Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class. 2015-01-12 13:35:29 +01:00
Marin Jankovski ef0cf7b42d Fix the api project ordering spec. 2015-01-12 11:49:07 +01:00
Marin Jankovski 8689ce1efe Add search filter option on project api for authorized projects. 2015-01-12 11:08:53 +01:00