Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Limit the scope of stub_const | Jacob Vosmaer | 2016-03-03 | 1 | -2/+5 |
| | |||||
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs | Jacob Vosmaer | 2016-03-03 | 4 | -3/+55 |
|\ | |||||
| * | Merge branch 'issue_4095' into 'master' | Dmitriy Zaporozhets | 2016-03-03 | 1 | -1/+28 |
| |\ | | | | | | | | | | | | | | | | | | | Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980 | ||||
| | * | Don't list merge requests from archived projects in Group view. | Rubén Dávila | 2016-03-02 | 1 | -0/+14 |
| | | | |||||
| | * | Don't list issues from archived projects in Group view. | Rubén Dávila | 2016-03-02 | 1 | -1/+14 |
| | | | |||||
| * | | Merge branch 'improve-user-tabs' into 'master' | Jacob Schatz | 2016-03-03 | 1 | -0/+16 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961 | ||||
| | * | | Add click to tab steps | Alfredo Sumaran | 2016-03-01 | 1 | -0/+16 |
| | | | | |||||
| * | | | Fixed failing profile tests | Phil Hughes | 2016-03-02 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Add CHANGELOG and testlogged-out-search | Dmitriy Zaporozhets | 2016-03-01 | 1 | -0/+9 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Rubocop | Jacob Vosmaer | 2016-03-01 | 1 | -1/+1 |
| | | |||||
* | | Fix 'big commit' spinach failure | Jacob Vosmaer | 2016-03-01 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '11489-branded-appearance-to-ce' into 'master' | Douwe Maan | 2016-02-29 | 2 | -0/+80 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :wink: /cc @DouweM See merge request !2927 | ||||
| * | Branded login page also in CE11489-branded-appearance-to-ce | Zeger-Jan van de Weg | 2016-02-26 | 2 | -0/+80 |
| | | | | | | | | | | 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 | ||||
* | | Merge branch 'issue_13621' into 'master' | Douwe Maan | 2016-02-29 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Don't repeat labels listed on Labels tab. Fixes #13622 See merge request !2924 | ||||
| * | | Don't repeat labels listed on Labels tab.issue_13621 | Rubén Dávila | 2016-02-22 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'master' into avatar-croppingavatar-cropping | Alfredo Sumaran | 2016-02-26 | 2 | -1/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'rs-crowd-form-view-spec' into 'master' | Rémy Coutable | 2016-02-26 | 1 | -25/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ \ | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' | Dmitriy Zaporozhets | 2016-02-25 | 2 | -1/+11 |
| |\ \ \ | |||||
| | * | | | Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverage | Rémy Coutable | 2016-02-22 | 2 | -1/+11 |
| | | | | | |||||
* | | | | | Merge branch 'rs-crowd-form-view-spec' into avatar-cropping | Alfredo Sumaran | 2016-02-24 | 1 | -25/+0 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec | Robert Speicher | 2016-02-24 | 1 | -25/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Fix Profile Avatar feature steps | Robert Speicher | 2016-02-24 | 1 | -6/+14 |
|/ / / | |||||
* | | | Merge branch 'issue_13301_emoji-menu' into 'master' | Robert Speicher | 2016-02-24 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888 | ||||
| * | | | Update award_emoji test | Annabel Dunstone | 2016-02-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add timeout for ajax call in award emoji steps; update focus in award picker | Annabel Dunstone | 2016-02-19 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master' | Robert Speicher | 2016-02-23 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749 | ||||
| * | | | | Add a spec to ensure Crowd login form is shown even when sign-in is disabledhudecof/show-crowd-login-form-when-signin-disabled | Rémy Coutable | 2016-02-23 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge branch 'dz-small-ui-fixes' into 'master' | Jacob Schatz | 2016-02-23 | 3 | -6/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758 | ||||
| * | | | | Fix spinach test for wiki markdown render | Dmitriy Zaporozhets | 2016-02-13 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Update tests to match new wiki header | Dmitriy Zaporozhets | 2016-02-09 | 3 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | fix failing testsempty-repo-instructions-fix | Phil Hughes | 2016-02-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Users don't get instructions to push to other users empty projects | Phil Hughes | 2016-02-22 | 2 | -0/+14 |
| |_|/ / |/| | | | | | | | | | | | Fixes #12518 | ||||
* | | | | Fixed failing issues tests | Phil Hughes | 2016-02-22 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | Removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 | ||||
* | | | | Update feature spec | Douwe Maan | 2016-02-20 | 1 | -10/+10 |
| | | | | |||||
* | | | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -34/+34 |
| | | | | |||||
* | | | | Rename menu item and page 'Task queue' to 'Tasks' | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Improve formatted message for tasks when action is a mention | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -3/+3 |
| | | | | |||||
* | | | | Add filters by project, author, type, and action to task queue page list | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -24/+92 |
| | | | | |||||
* | | | | Add feature spec for task queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+64 |
| |_|/ |/| | | |||||
* | | | Merge branch 'issue_3276' into 'master' | Jacob Schatz | 2016-02-19 | 1 | -0/+53 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599 | ||||
| * | | | Add specs. | Rubén Dávila | 2016-02-02 | 1 | -0/+53 |
| | | | | |||||
* | | | | Add some spinach specs | Rubén Dávila | 2016-02-19 | 2 | -0/+96 |
| | | | | |||||
* | | | | And CI API endpoint where user can erase a build | Grzegorz Bizon | 2016-02-19 | 1 | -1/+3 |
| | | | | |||||
* | | | | Create method that checks if build has been erased | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | + minor improvements | ||||
* | | | | Show information indicating that build has been erased | Grzegorz Bizon | 2016-02-19 | 1 | -0/+4 |
| | | | | |||||
* | | | | Add feature specs for build erase button | Grzegorz Bizon | 2016-02-19 | 2 | -0/+18 |
| | | | | |||||
* | | | | Merge branch 'fix/project-forks-page' into 'master' | Douwe Maan | 2016-02-19 | 1 | -0/+6 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | updated fix based on MR feedback | James Lopez | 2016-02-17 | 1 | -5/+0 |
| | | | | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-02-17 | 3 | -0/+31 |
| |\ \ \ | | | | | | | | | | | | | | | | fix/project-forks-page | ||||
| * | | | | workaround for forks with an invalid repo - avoid showing them in the list | James Lopez | 2016-02-16 | 1 | -0/+11 |
| | | | | |