home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,190 Commits 48 Branches 340 Tags
b05ab108f8f054e137d6ca3df9c211152afa23c7
Commit Graph
2584 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre 38026e5f77 Add pending tasks badge on top right next to the new and logout button 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 77d7910b8b Allow user to mark each task as done manually 2016-02-20 12:10:26 -02:00
Douglas Barbosa Alexandre 7cafa2ce92 Add tasks queue list page 2016-02-20 12:10:26 -02:00
Douwe Maan 31682eb987 Merge branch 'visibletrap/gitlab-ce-label' 2016-02-19 17:54:13 -08:00
Douwe Maan 3a97a5ddfd Merge branch 'rs-blob' into 'master' 
Add a `Blob` model that wraps `Gitlab::Git::Blob`

This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.

It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.

See merge request !2887
 2016-02-20 01:12:52 +00:00
Jacob Schatz de84fa365e Merge branch 'issue_3276' into 'master' 
Labels should be visible in milestone view

Closes #3276 

See merge request !2599
 2016-02-19 19:44:13 +00:00
Rubén DávilaandRobert Speicher cc5ff3b5a4 Use the adequate success path on the JSON endpoint. 
I forgot to update this and some spinach specs were failing.
 2016-02-19 13:15:43 -05:00
Rubén DávilaandRobert Speicher 5ef3f80d41 More updates from the last code review. 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38e708f0ce Add link to fork if user can't revert MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 9d4c105ab0 Remove code introduced when endpoint was in MR controller. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 1469b72c46 Check that target_branch is present. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 4dc8350517 Reuser revert commit modal in MR detail page. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 34e26b8212 Add button to revert commit on Commit detail page. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b6fe51b901 Some updates from last code review. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher df5f362c34 Add some specs plus some refactor. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher ae46d6ea04 Explain why MR can't be reverted. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 5bb5019e04 Use adequate description for new MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f4ff2ba57b Check target branch exists before creating revert MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 207522f923 Some refactor to the revert commit creation. 
* Not required to run hooks since it's an internal commit
 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher d7511a4b04 Create reverse branch and generate MR with new branch. #3409 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d3c2437328 Add new endpoint and button to revert merge. #3409 2016-02-19 13:14:48 -05:00
Grzegorz Bizon 96158aa6b3 Merge branch 'ci/remove-builds' into 'master' 
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
 2016-02-19 17:04:07 +00:00
Grzegorz Bizon 86a49dfb88 Move build erasable implementation from concern to model 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 2c7f36f430 Update relevant build fields when build is erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c8102d938b Add build eraseable feature implementation 2016-02-19 17:24:03 +01:00
Grzegorz Bizon c1affed196 Add build remove button to build summary view 2016-02-19 17:24:03 +01:00
Achilleas PipinellisandRémy Coutable c6e0db03eb Mention project name in fork notice 2016-02-19 17:06:14 +01:00
Patricio Cano 75ad91822d Merge branch 'saml-decoupling' into 'master' 2016-02-19 10:41:54 -05:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master' 
Update Gemojione for new hotness ✨

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
 2016-02-19 08:11:02 +00:00
Tap 44a9e26049 Find label in issues_finder 2016-02-19 13:50:47 +08:00
Robert Speicher 8c454b3624 Add a Blob model that wraps Gitlab::Git::Blob 
This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.

It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.
 2016-02-18 22:45:30 -05:00
Patricio Cano 06376be56a Decouple SAML authentication from the default Omniauth logic 2016-02-18 17:01:07 -05:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' " 
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
 2016-02-18 22:14:53 +01:00
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Douwe Maan 879d66b6ab Merge branch 'git-archive-refactor' into 'master' 
Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675
 2016-02-17 17:16:34 +00:00
Rémy Coutable 3d3ac87af9 Redirect /import to project page if no importing at all and repo exists 
Fixes #13367.
 2016-02-17 15:05:44 +01:00
Tap 2e81b1558b Label description and Label row 
- Add label description
- Show label row when filtering issues or merge requests by label
 2016-02-17 21:52:12 +08:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Douwe Maan 8db62f2548 Merge branch 'rs-issue-13467' into 'master' 
Ensure Commit#show responds 404 instead of 500 when given an invalid ID

Closes #13467

See merge request !2823
 2016-02-16 11:40:06 +00:00
Robert Speicher ae13389b0b Provide explicit html format when rendering git_not_found page 
Prior, if the request format was, for example, .zip, we'd get an
`ActionView::MissingTemplate` error.
 2016-02-15 16:38:27 -05:00
Robert Speicher 012c75d1b0 Properly render the errors/git_not_found page 2016-02-15 15:52:39 -05:00
Robert Speicher f5ab126fd0 Ensure Commit#show responds 404 instead of 500 when given an invalid ID 
Closes #13467
 2016-02-15 15:48:16 -05:00
Robert Speicher fe13f58f3e Update Emoji asset path 
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
 2016-02-12 15:34:20 -05:00
Douwe Maan 9022070fac Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' 
Fix milestone order in project and issue edit lists to due_date

_Originally opened at !2579 by @olirogers._

- - -

This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001.

This continues the work of !1934 to order milestones.

I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome.

See merge request !2780
 2016-02-12 09:32:57 +00:00