home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,196 Commits 48 Branches 340 Tags
e13333aa1df472aee467d4a751b5fd7eb6156498
Commit Graph
9405 Commits
Author SHA1 Message Date
Robert Speicher e13333aa1d Make the loading spinner toggle more explicit 
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
 2015-10-11 19:23:48 -04:00
Dmitriy ZaporozhetsandRobert Speicher 67fec8b394 Fix admin runner page -> assign all button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-05 14:06:45 -04:00
Kamil TrzcinskiandRobert Speicher 38b0bd31e3 Fix: CI token removal regression from build trace 2015-10-05 14:06:29 -04:00
Valery SizovandRobert Speicher 9a26120c71 Fix anchors to comments in diffs 2015-10-05 14:03:27 -04:00
Geoffrey ChallenandRobert Speicher b4963a75df Fix referals for :back and relative URL installs. 2015-10-05 14:02:10 -04:00
Stan HuandRobert Speicher 11cc2cd221 Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped 
Closes #2867
 2015-10-05 13:58:43 -04:00
Stan HuandRobert Speicher 9683d1ef1f Fix Error 500 in creating merge requests with > 1000 diffs 
Closes #2692
 2015-09-28 22:44:53 -04:00
Dmitriy ZaporozhetsandRobert Speicher df1a235f23 Merge branch 'fix-stuck-forked-project-import' into 'master' 
Fix bug where projects would appear to be stuck in the forked import state

A race condition existed between when Rails committed the `import_status` to
`started` and when the Sidekiq worker forked a project. If this fork were quick,
it's possible that the worker would attempt to move into the `finished` state
before the `started` state took effect.

As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345,
we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See:

* https://github.com/pluginaweek/state_machine/issues/191 
* https://github.com/shellycloud/after_commit_queue


Closes #2736

See merge request !1434
 2015-09-28 22:42:18 -04:00
Dmitriy ZaporozhetsandRobert Speicher 6249459cfd Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

See merge request !1391
 2015-09-28 22:40:59 -04:00
Sytse Sijbrandij 41bb994836 I misunderstood how the button worked. 2015-09-24 16:07:22 -07:00
Sytse Sijbrandij 4d287c8c15 Make instructions for CI disable checkbox clear. 2015-09-24 15:53:50 -07:00
Robert SpeicherandRobert Speicher 199448781a Merge branch 'get-ci-token-from-ci-projects' into 'master' 
Get CI token from ci projects

This fixes problem when GitLabCiService had different token than stored
in Ci::Project.

See merge request !1425
 2015-09-24 15:49:43 -04:00
Douwe MaanandRobert Speicher 55d771104c Merge branch 'rs-help-page' into 'master' 
Help page improvements

- Only signed-in users can see version information
- Add "Community Edition" text so the header is
  less barren when version information is hidden
- Minor copy edits
- Make all "Quick help" link text the entire body
  of the link. Prior, it wasn't obvious which part
  of each item was an actual link.

Closes #2721 

See merge request !1415
 2015-09-24 14:26:12 -04:00
Stan HuandRobert Speicher ae51989e19 Use standard Markdown font in Markdown preview instead of fixed-width font 
Closes #2585
 2015-09-24 14:25:08 -04:00
Stan HuandRobert Speicher 222ededa34 Fix default avatar not showing up in network graph 
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
 2015-09-24 14:24:05 -04:00
Stan HuandRobert Speicher 5f0983b207 Remove git refs used internally by GitLab from network graph 
Closes #2702
 2015-09-24 14:21:20 -04:00
Robert SpeicherandRobert Speicher 8a973a12a8 Merge branch 'rs-sign-in-margin' into 'master' 
Fix top margin for sign-in button on public pages

Closes #2615

[ci skip]

See merge request !1412
 2015-09-23 13:03:25 -04:00
Stan HuandRobert Speicher 7bf3a90ac2 Make commit graphs responsive to window width changes 
Closes #2653
 2015-09-23 12:33:11 -04:00
Hannes RosenöggerandRobert Speicher bfc4138071 clarify confirmation text on user deletion. 2015-09-23 12:25:52 -04:00
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
Stan Hu 0346e9724a Tweak remaining CSS for Markdown preview 
Missed a few items in !1378
 2015-09-21 14:08:26 -07: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
Robert Speicher d4a960161e Merge branch 'rename-reply-by-email' into 'master' 
Rename reply_by_email to incoming_email to prepare for the future.

Closes #2579.

See merge request !1367
 2015-09-21 18:52:13 +00:00
Dmitriy Zaporozhets cbdee053b4 Merge branch 'fix-ci-handling' into 'master' 
Fixed MR handling when GitLab CI project is not present

This is copy of !1371

/cc @jacobvosmaer @vsizov @dzaporozhets



See merge request !1373
 2015-09-21 18:29:29 +00:00
Robert Speicher cacc70daf4 Merge branch 'fix-note-edit-preview-css' into 'master' 
More tweaks to make note edit/preview CSS consistent

Closes #2585

See merge request !1378
 2015-09-21 18:18:55 +00:00
Dmitriy Zaporozhets cc851b04c0 Merge branch 'fix-mr-without-refs' into 'master' 
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>

Needed for 8.0

Fixes #2580 

See merge request !1377
 2015-09-21 17:13:29 +00:00
Stan Hu ef2fb20135 More tweaks to make note edit/preview CSS consistent 
Closes #2585
 2015-09-21 10:11:58 -07:00
Dmitriy Zaporozhets e0a23791d3 Merge branch 'fix-milestone-destroy-in-mr' into 'master' 
Remove milestones from merge requests when milestones are deleted

Destroying a milestone does not remove it from existing merge requests. This MR fixes that.

Requires f4816372 to pull in as well.

Reported by https://github.com/gitlabhq/gitlabhq/issues/9643

See merge request !1348
 2015-09-21 16:21:12 +00:00
Dmitriy Zaporozhets 39ed04c7b5 Merge branch 'repo-size-link' into 'master' 
Link project repo size to files



See merge request !1374
 2015-09-21 15:24:26 +00:00
Dmitriy Zaporozhets ea64ba1fe3 Merge branch 'remove-project-panel-ci-button' into 'master' 
Remove CI button from project home panel

Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page.


See merge request !1372
 2015-09-21 14:44:52 +00:00
Dmitriy Zaporozhets de729a1e9c Merge branch 'ci-nav-fw' into 'master' 
Use fixed-width icons in CI nav sidebar.



See merge request !1376
 2015-09-21 14:41:56 +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
Stan Hu ea5c25bb4e Remove milestones from merge requests when milestones are deleted 
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
 2015-09-21 07:00:55 -07:00
Douwe Maan 09e0f8abb4 Use fixed-width icons in CI nav sidebar. 2015-09-21 15:04:30 +02:00
Douwe Maan f935259260 Use consistent styling for number of commits in CI nav sidebar 2015-09-21 14:59:50 +02:00
Douwe Maan a9d686b2fb Link project repo size to files 2015-09-21 14:57:33 +02:00
Kamil Trzcinski ca6fd0a27d Fixed MR handling when GitLab CI project is not present 2015-09-21 14:55:02 +02:00
Douwe Maan 82edd68e55 Remove CI button from project home panel 2015-09-21 14:53:58 +02:00
Kamil Trzcinski abaa65efc1 Revert "Fixed MR handling when GitLab CI project is not present" 
This reverts commit 3abcab779e.
 2015-09-21 14:52:51 +02:00
Kamil Trzcinski 3abcab779e Fixed MR handling when GitLab CI project is not present 2015-09-21 13:53:03 +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
Dmitriy Zaporozhets 2460d290af Merge branch 'sh-fix-issue-2585' into 'master' 
Make Markdown area formatting consistent

Issue #2585 


See merge request !1354
 2015-09-21 08:57:51 +00:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Marin Jankovski d2c90d7494 Merge branch 'optimize-ci-tags-migration' into 'master' 
CI migration rake task for GitLab CE

- Uses backup format for final GitLab CI 8.0
- Highly optimized tags migration SQL queries


See merge request !1365
 2015-09-21 08:26:06 +00:00
Dmitriy Zaporozhets 8bb3215d54 Merge branch 'fail-ci-builds-without-yml' into 'master' 
Fail ci builds without yml

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551

See merge request !1349
 2015-09-21 07:49:18 +00:00
Douwe Maan 46173ec8ce Merge branch 'fix-markdown-links-in-dashboard' into 'master' 
Fix Markdown links not showing up in dashboard activity feed

Closes #2586

See merge request !1353
 2015-09-21 07:24:19 +00:00
Robert Speicher ca45e925df Merge branch 'reply-by-email-diff' into 'master' 
Fix reply by email for comments on a specific line in a diff/commit.

Fixes #2363.

See merge request !1364
 2015-09-21 00:51:53 +00:00
Kamil Trzcinski b2a9021685 Change wording 2015-09-21 00:42:25 +02:00