Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-crowd-form-view-spec' into 'master' | Rémy Coutable | 2016-02-26 | 2 | -36/+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 | ||||
| * | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec | Robert Speicher | 2016-02-24 | 2 | -36/+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. | ||||
* | | Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' | Dmitriy Zaporozhets | 2016-02-25 | 3 | -1/+13 |
|\ \ | |||||
| * | | Add a spec for coverage indicator in project's builds listBaertierchen/gitlab-ce-showTestCoverage | Rémy Coutable | 2016-02-22 | 3 | -1/+13 |
| | | | |||||
* | | | Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' | Jacob Schatz | 2016-02-24 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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   Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620 | ||||
| * | | Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizing | Alfredo Sumaran | 2016-02-23 | 1 | -0/+1 |
| | | | |||||
| * | | Fix failing spec | Alfredo Sumaran | 2016-02-23 | 1 | -1/+0 |
| | | | |||||
| * | | Set window_size to 1366*768 | Alfredo Sumaran | 2016-02-23 | 1 | -1/+1 |
| | | | |||||
* | | | fixed tests | Phil Hughes | 2016-02-24 | 1 | -3/+9 |
| | | | |||||
* | | | 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 | 2 | -7/+13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -7/+13 |
| | | | | | |||||
* | | | | | 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 | 2 | -5/+1 |
| | | | | | |||||
* | | | | | Users don't get instructions to push to other users empty projects | Phil Hughes | 2016-02-22 | 4 | -0/+25 |
| |_|_|/ |/| | | | | | | | | | | | 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 | 3 | -45/+45 |
| | | | | |||||
* | | | | Rename menu item and page 'Task queue' to 'Tasks' | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -2/+2 |
| | | | | |||||
* | | | | 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 | 2 | -24/+115 |
| | | | | |||||
* | | | | Add feature spec for task queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -0/+79 |
| | | | | |||||
* | | | | Merge branch 'issue_3276' into 'master' | Jacob Schatz | 2016-02-19 | 2 | -0/+76 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599 | ||||
| * | | | | Add specs. | Rubén Dávila | 2016-02-02 | 2 | -0/+76 |
| | | | | | |||||
* | | | | | Add some spinach specs | Rubén Dávila | 2016-02-19 | 4 | -0/+154 |
| | | | | | |||||
* | | | | | Fix feature tests for erasing build | Grzegorz Bizon | 2016-02-19 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | 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 | 2 | -0/+5 |
| | | | | | |||||
* | | | | | Add feature specs for build erase button | Grzegorz Bizon | 2016-02-19 | 3 | -0/+25 |
| | | | | | |||||
* | | | | | Merge branch 'fix/project-forks-page' into 'master' | Douwe Maan | 2016-02-19 | 2 | -0/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-02-17 | 5 | -1/+40 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | fix/project-forks-page | ||||
| * | | | | | workaround for forks with an invalid repo - avoid showing them in the list | James Lopez | 2016-02-16 | 2 | -0/+18 |
| | | | | | | |||||
* | | | | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issues | Douglas Barbosa Alexandre | 2016-02-17 | 5 | -0/+144 |
| |/ / / / |/| | | | | |||||
* | | | | | sporadic spec fixspec_fix | Valery Sizov | 2016-02-16 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebar | Rémy Coutable | 2016-02-15 | 4 | -1/+38 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | 1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter. | ||||
* | | | Add spinach tests for award emojifix-me-me-me-me | Stan Hu | 2016-02-13 | 2 | -1/+36 |
| | | | |||||
* | | | Parse XML instead of HTML in tests for a SVG build badgefix/ci-build-status-badge | Grzegorz Bizon | 2016-02-11 | 3 | -7/+7 |
| | | | |||||
* | | | Move build badge specs to badges directory | Grzegorz Bizon | 2016-02-11 | 2 | -6/+3 |
| | | | |||||
* | | | Move builds badge implementation to new badges controller | Grzegorz Bizon | 2016-02-11 | 1 | -1/+1 |
| | | | |||||
* | | | Inherit build badge access permissions from project | Grzegorz Bizon | 2016-02-11 | 2 | -1/+3 |
| | | | |||||
* | | | Improve build badge tests, add another test case | Grzegorz Bizon | 2016-02-11 | 3 | -6/+19 |
| | | | |||||
* | | | Add feature tests for builds status badge | Grzegorz Bizon | 2016-02-11 | 3 | -2/+52 |
| | | | |||||
* | | | Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-one | Douglas Barbosa Alexandre | 2016-02-10 | 1 | -1/+1 |
| | | | |||||
* | | | Replaces "Create merge request" link with one to the MR when one exists | Douglas Barbosa Alexandre | 2016-02-10 | 2 | -0/+93 |
| | | |