home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,196 Commits 48 Branches 340 Tags
e13333aa1df472aee467d4a751b5fd7eb6156498
Commit Graph
2031 Commits
Author SHA1 Message Date
Douwe MaanandRobert Speicher e8c144af51 Merge branch 'rs-fix-help-links' into 'master' 
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
 2015-09-23 12:23:26 -04:00
Dmitriy ZaporozhetsandMarin Jankovski 9b6cebf9f8 Merge branch 'fix-ci-permissions' into 'master' 
Fix CI permissions

![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png)

This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users

See merge request !1379
 2015-09-22 10:03:09 +02:00
Robert Speicher ba71542a5a Merge branch 'fix-issue-2593' into 'master' 
Fix Error 500 when comparing non-existing branches

Closes #2593

See merge request !1355
 2015-09-21 20:46:15 +00:00
Dmitriy Zaporozhets 3a001a9290 Fetch merge request ref if it is missing when visit MR page 
This will fix merge problem for merge requests between forks created
before 8.0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-21 16:25:59 +02:00
Douwe Maan 183892fde9 Merge branch 'notification-levels' into 'master' 
Notification levels can now be set on the Project's main page

![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)

The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.

Saving is done via a remote form submission and if successful shows the user a flash message:

![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)

@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.

@rspeicher hopefully we can include it with the 8.0 release, maybe?

/cc @darby 

See merge request !1322
 2015-09-21 09:19:32 +00:00
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00
Robert Speicher 259851c0d6 Bump devise-two-factor to 2.0.0 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
 2015-09-19 21:16:18 -04:00
Robert Speicher 69723d2002 Devise 3.5.x deprecates confirm! in favor of confirm 2015-09-19 21:15:13 -04:00
Stan Hu de8497ca56 Fix Error 500 when comparing non-existing branches 
Closes #2593
 2015-09-18 12:02:01 -07:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen 1eb3dde45b Merge branch 'add-custom-text-to-help' into 'master' 
Allow custom info to be added to Help page

Fixes #2536

**Admin screen**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png)

**Text on the Help page**

![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png)

/cc @DouweM

See merge request !1309
 2015-09-18 09:24:15 +00:00
Dmitriy Zaporozhets d272682a15 Merge branch 'fix-ci-non-public-project' into 'master' 
Fix 500 when accessing private project when not logged in



See merge request !1336
 2015-09-18 09:18:49 +00:00
Valery Sizov 3984818bb3 Merge branch 'ci_projects_order' into 'master' 
Fix: ci projects order

https://gitlab.com/gitlab-org/gitlab-ce/issues/2553

See merge request !1333
 2015-09-18 08:54:06 +00:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page 
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 10:15:40 +02:00
Kamil Trzcinski d4be967478 Fix 500 when accessing private project when not logged in 2015-09-17 23:27:08 +02:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
Kamil Trzciński 0aec0d53b1 Merge branch 'remove-ci-help' into 'master' 
Remove CI help

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

See merge request !1325
 2015-09-17 16:22:24 +00:00
Kamil Trzcinski 7166f7b7cf Remove CI help 2015-09-17 17:09:10 +02:00
Stan Hu ac855e5ed3 Move partial locals out of controller 2015-09-17 07:24:45 -07:00
Stan Hu f481637245 Merge branch 'fix-issue-2382' into 'master' 
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity

Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".

Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png)

Closes #2382

See merge request !1227
 2015-09-17 08:04:37 +00:00
Patricio Cano 23f9a64566 Use the find_by_user_id magic finder instead of where. 2015-09-16 21:02:40 -05:00
Patricio Cano 1ddefa3bea Merge branch 'master' into notification-levels 2015-09-16 19:54:18 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Stan Hu c61b6eeb2f Merge pull request #9634 from allistera/users-autocomplete-sort-order 
Sorted autocomplete users list by name
 2015-09-15 16:41:15 -07:00
Allister Antosik c9389d0e74 Sorted autocomplete users list by name 2015-09-15 22:48:24 +01:00
Kamil Trzcinski fb9cb3f06c Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-15 23:20:00 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename 
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
 2015-09-15 13:07:32 -07:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Stan Hu d3d03d1362 Create a "destroyed Milestone" event and keep Milestone events around in the DB 
for posterity.

Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".

Add "in" preposition when creating and destroying milestones

Closes #2382
 2015-09-15 05:51:11 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Patricio Cano 01cc20378b Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global. 2015-09-14 20:33:24 -05:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master 
add "replace" and "upload" functionality
 2015-09-14 17:57:41 -07:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05:00
liyakun e2ece2bc35 Add "Replace" and "Upload" features 
Refactor upload and replace functionality

    Rename file and move CSS

    Fix typo

    Make dropzone a div

    Remove unnecessary file

    Change color of "upload existing one"

    Add missing changes
 2015-09-15 02:12:56 +02:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master' 
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
 2015-09-14 15:28:42 +00:00
Dmitriy Zaporozhets c0c314c6bf Merge branch 'forked-repo-creation-async' into 'master' 
Import forked repositories asynchronously to prevent large repositories from timing out

Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.

One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.

* Closes #2388
* Closes #2400

See merge request !1231
 2015-09-14 14:56:13 +00:00
Kamil Trzcinski f31d8ef287 Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb
 2015-09-14 14:04:08 +02:00
Kamil Trzcinski 1ce85dc4e2 Fix navigation and header tile 
Remove redundant navigation on commits and builds page
 2015-09-14 14:03:02 +02:00
Kamil Trzcinski d0019456cd Fix runners administration 2015-09-14 14:00:53 +02:00
Kamil Trzcinski ec91340240 Remove duplicate notices 2015-09-14 13:59:19 +02:00
Valery Sizov 4c53cc0eba rubocop satisfy 2015-09-14 14:37:18 +03:00
Dmitriy Zaporozhets 4e1c6019c8 Allow access to group from root url 2015-09-14 11:16:54 +02:00
Dmitriy Zaporozhets 4c060074b7 Skip auth for group page but return auth for other group pages 2015-09-14 11:05:23 +02:00
Dmitriy Zaporozhets 15eeae5fa8 Fix 500 when search for gitlab projects 2015-09-11 19:59:39 +02:00
Dmitriy Zaporozhets 2b683807b5 Use GitLab UI when render CI 2015-09-11 19:25:53 +02:00