home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,673 Commits 48 Branches 340 Tags
741cf430f7608846db6fe032de5ea723fc36e316
Commit Graph
1310 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 7e710acc1c Merge branch 'issue_4095' into 'master' 
Don't show Issues/MRs from archived projects in Groups view

Fixes #4095 

See merge request !2980
 2016-03-03 09:53:06 +00:00
Jacob Schatz 1fa7671f44 Merge branch 'improve-user-tabs' into 'master' 
Add routes and actions for dynamic tab loading. Closes #13588 and #13584



See merge request !2961
 2016-03-03 00:13:19 +00:00
Rubén Dávila b41a274b62 Don't list merge requests from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 0b86b46a2c Don't list issues from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Phil Hughes e05f1ece91 Fixed failing profile tests 2016-03-02 11:41:52 +00:00
Alfredo Sumaran 6bcfccf749 Fix specs 2016-03-01 17:42:44 -05:00
Alfredo Sumaran cb7dd09a9c Add click to tab steps 2016-03-01 17:42:39 -05:00
Dmitriy Zaporozhets b4c842b321 Add CHANGELOG and test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 16:29:16 +01:00
Josh Frye cc9f93f9d2 Add routes and actions for dynamic tab loading 2016-02-29 08:24:07 -05:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master' 
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
 2016-02-29 13:18:29 +00:00
Douwe Maan a297e44048 Merge branch 'issue_13621' into 'master' 
Don't repeat labels listed on Labels tab.

Fixes #13622 

See merge request !2924
 2016-02-29 13:16:00 +00:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE 
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
 2016-02-26 15:50:51 +01:00
Alfredo Sumaran 08ec838ed5 Merge branch 'master' into avatar-cropping 2016-02-26 09:32:07 -05:00
Rémy Coutable bb3563b5cd Merge branch 'rs-crowd-form-view-spec' into 'master' 
Move "I should see Crowd login form" feature to a view spec

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

See merge request !2963
 2016-02-26 11:27:27 +00:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Alfredo Sumaran b2dcfc4db3 Merge branch 'rs-crowd-form-view-spec' into avatar-cropping 2016-02-24 19:10:50 -05:00
Jacob Schatz 856153d712 Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' 
Sidebar overlaps content when screen is below 1200px.

When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717 
![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)

![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)

Also sorry I couldn't get the collapse button in the screen cap. It's there. 


See merge request !2620
 2016-02-24 23:09:29 +00:00
Robert Speicher b95ef77e23 Move "I should see Crowd login form" feature to a view spec 
We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.
 2016-02-24 17:38:13 -05:00
Robert Speicher b9156669fe Fix Profile Avatar feature steps 2016-02-24 13:50:08 -05:00
Phil Hughes b82569e5ea fixed tests 2016-02-24 08:28:33 +00:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master' 
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
 2016-02-24 02:50:45 +00:00
Annabel Dunstone 476a804969 Update award_emoji test 2016-02-23 19:37:15 -06:00
Alfredo Sumaran be0f97a6d4 Initialize navigation shortcuts on project's files page 2016-02-23 20:04:20 -05:00
Alfredo Sumaran 5507c24ffd Fix failing spec 2016-02-23 15:59:10 -05:00
Alfredo Sumaran 78bf02e93d Set window_size to 1366*768 2016-02-23 15:29:55 -05:00
Robert Speicher ad3433f91e Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master' 
Show Crowd login even when sign-in is disabled

Fixes #13176.

See merge request !2749
 2016-02-23 18:19:41 +00:00
Jacob Schatz 1142b327e8 Merge branch 'dz-small-ui-fixes' into 'master' 
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler 

See merge request !2758
 2016-02-23 15:38:20 +00:00
Rémy Coutable eb178f6d66 Add a spec to ensure Crowd login form is shown even when sign-in is disabled 2016-02-23 15:13:50 +01:00
Phil Hughes 3ec1bffc6c fix failing tests 2016-02-23 08:42:29 +00:00
Rémy Coutable f36fde94d0 Add a spec for coverage indicator in project's builds list 2016-02-22 19:34:35 +01:00
Rubén Dávila 3d96bfaa8a Don't repeat labels listed on Labels tab. 2016-02-22 13:17:38 -05:00
Phil Hughes 62f4a9de19 Users don't get instructions to push to other users empty projects 
Fixes #12518
 2016-02-22 17:37:26 +00:00
Phil Hughes 51c17329a4 Fixed failing issues tests 
Removed up/down vote icons from merge requests. Was missed from d8069bd858
 2016-02-22 11:35:52 +00:00
Douwe Maan 7f30268545 Update feature spec 2016-02-20 12:05:57 -08:00
Douglas Barbosa Alexandre 3d52e139b1 Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
Douglas Barbosa Alexandre a57bf9bd39 Rename menu item and page 'Task queue' to 'Tasks' 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 8673a70f50 Improve formatted message for tasks when action is a mention 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre 07eb334c25 Add filters by project, author, type, and action to task queue page list 2016-02-20 12:12:05 -02:00
Douglas Barbosa Alexandre b05ab108f8 Add feature spec for task queue list page 2016-02-20 12:10:26 -02: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 87b076f2ce Add some spinach specs 2016-02-19 13:14:55 -05:00
Grzegorz Bizon 36971a5046 Fix feature tests for erasing build 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 6ca99bd899 And CI API endpoint where user can erase a build 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c850ceec5d Create method that checks if build has been erased 
+ minor improvements
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon ede451c851 Show information indicating that build has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bd7c52c734 Add feature specs for build erase button 2016-02-19 17:24:59 +01:00
Annabel Dunstone b80df08735 Add timeout for ajax call in award emoji steps; update focus in award picker 2016-02-19 07:32:20 -06:00
Douwe Maan cb0b7de482 Merge branch 'fix/project-forks-page' into 'master' 
workaround for forks with an invalid repo

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

The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. 

With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem...

Also fixing Sentry issue: 1180
`undefined method 'already_forked?' for nil:NilClass `


See merge request !2836
 2016-02-19 08:00:58 +00:00
James Lopez 4b650fac76 updated fix based on MR feedback 2016-02-17 18:05:40 +01:00
James Lopez dd68d100e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-forks-page 2016-02-17 17:53:24 +01:00