Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix eslint for spec global needed in pagination spec for 'fixture'auto-pipelines-vue | Regis | 2017-01-09 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 75 | -188/+1039 |
|\ | |||||
| * | Merge branch '19086-double-newline' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | | | | | Fix Double Spaced CI Log Closes #19086 See merge request !8349 | ||||
| | * | Test newline and carraige return groups | Jared Deckard | 2016-12-28 | 1 | -0/+8 |
| | | | |||||
| * | | Merge branch 'feature/log-ldap-to-application-log' into 'master' | Rémy Coutable | 2017-01-09 | 1 | -8/+55 |
| |\ \ | | | | | | | | | | | | | | | | | Log LDAP blocking/unblocking events to application log See merge request !8042 | ||||
| | * | | fixup! Log messages when blocking/unblocking LDAP accounts | Markus Koller | 2016-12-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Log messages when blocking/unblocking LDAP accounts | Markus Koller | 2016-12-20 | 1 | -8/+55 |
| | | | | |||||
| * | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' | Sean McGivern | 2017-01-09 | 3 | -0/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Record and show last used date of SSH Keys See merge request !8113 | ||||
| | * | | | Record and show last used date of SSH Keys | Vincent Wong | 2017-01-09 | 3 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used | ||||
| * | | | | Merge branch 'fix-broken-url-on-group-avatar' into 'master' | Sean McGivern | 2017-01-09 | 1 | -0/+32 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken url on group avatar Closes #26452 See merge request !8464 | ||||
| | * | | | | Fix broken url on group avatar | hogewest | 2017-01-06 | 1 | -0/+32 |
| | | | | | | |||||
| * | | | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 12 | -31/+45 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281 | ||||
| | * | | | | | Fixed a test and change the arrow functions to named functions | Jose Ivan Vargas | 2017-01-04 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Fixed tests | Jose Ivan Vargas | 2017-01-03 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Updated some tests descriptions to represent the correct settings path | Jose Ivan Vargas | 2017-01-03 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the js from the member_expiration_date to es6 | ||||
| | * | | | | | Added tests for the MembersController and corrected some more tests | Jose Ivan Vargas | 2017-01-03 | 2 | -1/+15 |
| | | | | | | | |||||
| | * | | | | | Removed the "Groups" option from the settings gear | Jose Ivan Vargas | 2017-01-03 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed more tests | ||||
| | * | | | | | Fixed more rspec tests as well as spinach features | Jose Ivan Vargas | 2017-01-03 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Fixed rspec tests for the project members also fixed the index | Jose Ivan Vargas | 2017-01-03 | 7 | -20/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | view (removed an extra tag ) | ||||
| | * | | | | | Moved the members (project_members)option to a single controller called members | Jose Ivan Vargas | 2017-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path | ||||
| * | | | | | | Merge branch 'fixed-failing-markdown-input-tests' into 'master' | Rémy Coutable | 2017-01-06 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing markdown button tests See merge request !8471 | ||||
| | * | | | | | | Fixed failing markdown button tests | Phil Hughes | 2017-01-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch ↵ | Alfredo Sumaran | 2017-01-06 | 44 | -106/+605 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task' into 'master' Precompile all frontend test fixtures Closes #26226 See merge request !8384 | ||||
| | * | | | | | | | fix right_sidebar_spec ajax call26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task | Mike Greiling | 2017-01-05 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | replace Teaspoon fixture methods with jasmine-jquery methods to reduce ↵ | Mike Greiling | 2017-01-05 | 41 | -97/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency on Teaspoon | ||||
| | * | | | | | | | Merge branch 'fix-u2f-fixtures' into ↵ | Mike Greiling | 2017-01-05 | 4 | -23/+36 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task * fix-u2f-fixtures: generate u2f frontend fixtures dynamically force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues exclude script type=text/template from dom scrubbing | ||||
| | * | | | | | | | | make projects.json easier to read | Mike Greiling | 2017-01-03 | 1 | -1/+445 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix dynamic u2f fixtures | Mike Greiling | 2017-01-03 | 5 | -5/+37 |
| | | | | | | | | | | |||||
| | * | | | | | | | | update all frontend tests to point to precompiled fixtures | Mike Greiling | 2017-01-03 | 29 | -55/+55 |
| | | | | | | | | | | |||||
| | * | | | | | | | | recursively clean compiled fixtures | Mike Greiling | 2017-01-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | create catch-all fixture generator for all static fixtures | Mike Greiling | 2017-01-03 | 1 | -0/+31 |
| | | | | | | | | | | |||||
| | * | | | | | | | | allow storage of raw string fixtures | Mike Greiling | 2017-01-03 | 1 | -3/+15 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'speed-up-group-milestone-index' into 'master' | Sean McGivern | 2017-01-06 | 2 | -16/+102 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinder See merge request !8363 | ||||
| | * | | | | | | | | | Speed up group milestone index by passing group_id to IssuesFinder | Adam Niedzielski | 2017-01-06 | 2 | -16/+102 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fix-users-api-500-error' into 'master' | Rémy Coutable | 2017-01-06 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 errors when creating a user with identity via API Closes #26295 See merge request !8442 | ||||
| | * | | | | | | | | | | Add a failing spec to the POST /users API | Rémy Coutable | 2017-01-04 | 1 | -0/+8 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | | | Merge branch 'set_ldap_config_attributes_defaults' into 'master' | Rémy Coutable | 2017-01-06 | 2 | -5/+30 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP attributes needs default values See merge request !8465 | ||||
| | * | | | | | | | | | LDAP attributes needs default values | Drew Blessing | 2017-01-06 | 2 | -5/+30 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fix-timezone-due-date-picker' into 'master' | Alfredo Sumaran | 2017-01-06 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timezone due date picker Closes #24253 See merge request !8081 | ||||
| | * | | | | | | | | | | Wait for ajax after clicking on a date | Alfredo Sumaran | 2017-01-05 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | remove unnecessary fixtures and tests | Mike Greiling | 2017-01-02 | 3 | -86/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | add rspec feature test | Mike Greiling | 2017-01-02 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | fix eslint complaints | Mike Greiling | 2017-01-02 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | use single sprockets require comment style and remove eslint-disable | Mike Greiling | 2017-01-02 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Pass date as integer params on instantiate new Date in order to avoid time ↵ | giulianovarriale | 2017-01-02 | 3 | -0/+86 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zone inconsistency | ||||
| * | | | | | | | | | | Merge branch 'fix-u2f-fixtures' into 'master' | Alfredo Sumaran | 2017-01-05 | 6 | -6/+51 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | | | Replace static JavaScript fixtures for u2f See merge request !8426 | ||||
| | * | | | | | | | | generate u2f frontend fixtures dynamically | Mike Greiling | 2017-01-05 | 5 | -5/+49 |
| | | | | | | | | | | |||||
| | * | | | | | | | | force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues | Mike Greiling | 2017-01-05 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | exclude script type=text/template from dom scrubbing | Mike Greiling | 2017-01-05 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'markdown-button-newline-bug-fix' into 'master' | Fatih Acet | 2017-01-05 | 1 | -0/+37 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new line being included in bold/italic in GFM form Closes #25456 See merge request !8086 |